diff --git a/install.ps1 b/install.ps1 index 1d9db998d..ee641b523 100644 --- a/install.ps1 +++ b/install.ps1 @@ -11,7 +11,7 @@ $ErrorActionPreference = "Stop" $defaultInstallUrl = "https://raw.githubusercontent.com/Abdess/retrobios/main/install.py" - $defaultInstallSha256 = "6cf53f4fb49a96cbb6a13a0517a51440ea86f873fcc711158638db9b41217f64" + $defaultInstallSha256 = "ebd49c716385fbbb440e10a324776a4a0b3803e2b1e8a6a32325e766891a719e" $maximumInstallerBytes = 2MB $installerExit = 0 $installer = if ($PSScriptRoot) { Join-Path $PSScriptRoot "install.py" } else { $null } diff --git a/install.py b/install.py index deabf7d73..46d0ae470 100644 --- a/install.py +++ b/install.py @@ -13065,9 +13065,7 @@ def _tui_sources(state: TuiState, installed: int, failed: int) -> str: name = _last_name(folder) folders[name] = folders.get(name, 0) + 1 copied = fixed + sum(folders.values()) - line = sources_line(list(folders.items()), fixed, max(0, installed - copied), failed) - # A fix copies: the misplaced files are the user's, never moved. - return line + (" Your copies at the wrong place were left as they are." if fixed else "") + return sources_line(list(folders.items()), fixed, max(0, installed - copied), failed) def _unavailable(state: TuiState) -> tuple[list[dict], int]: @@ -13148,6 +13146,10 @@ def tui_outcome(state: TuiState) -> tuple[str, list[str]]: sources = _tui_sources(state, installed, len(failed)) if sources: lines.append(sources) + ok = {dest for dest, good, _why in state.finished if good} + if any(reason and dest in ok for dest, (_folder, reason) in state.local_dests.items()): + # A fix copies: the misplaced files are the user's, never moved. + lines.append("Your copies at the wrong place were left as they are.") lines.append(f"BIOS folder: {state.dest}") if installed + up_to_date: lines += _saves_lines(state, state.done_saves) diff --git a/install.sh b/install.sh index 7185777bf..07aff15cb 100755 --- a/install.sh +++ b/install.sh @@ -18,7 +18,7 @@ esac TEMP_INSTALLER="" TEMP_DIRECTORY="" DEFAULT_INSTALL_URL="https://raw.githubusercontent.com/Abdess/retrobios/main/install.py" -DEFAULT_INSTALL_SHA256="6cf53f4fb49a96cbb6a13a0517a51440ea86f873fcc711158638db9b41217f64" +DEFAULT_INSTALL_SHA256="ebd49c716385fbbb440e10a324776a4a0b3803e2b1e8a6a32325e766891a719e" MAX_INSTALLER_BYTES=2097152 cleanup() { diff --git a/install/launchers/index.json b/install/launchers/index.json index 9b89a1245..c231b5c89 100644 --- a/install/launchers/index.json +++ b/install/launchers/index.json @@ -27,8 +27,8 @@ { "dest": "roms/ports/retrobios/install.py", "repo_path": "install.py", - "size": 624453, - "sha256": "6cf53f4fb49a96cbb6a13a0517a51440ea86f873fcc711158638db9b41217f64", + "size": 624596, + "sha256": "ebd49c716385fbbb440e10a324776a4a0b3803e2b1e8a6a32325e766891a719e", "executable": false }, { @@ -71,8 +71,8 @@ "muos": { "archive": { "dest": "ARCHIVE/RetroBIOS.muxapp", - "size": 675156, - "sha256": "f3d238de327230cdde248efb9e4a2a24cf28724c82c2e73e84c3da75907f0651" + "size": 675299, + "sha256": "95b39b09ea326bdcdd8f3a9cde459c70dce230a3edccd2c73acf53949cd27c04" }, "members": [ { @@ -85,8 +85,8 @@ { "name": "RetroBIOS/install.py", "repo_path": "install.py", - "size": 624453, - "sha256": "6cf53f4fb49a96cbb6a13a0517a51440ea86f873fcc711158638db9b41217f64", + "size": 624596, + "sha256": "ebd49c716385fbbb440e10a324776a4a0b3803e2b1e8a6a32325e766891a719e", "executable": false }, { @@ -159,8 +159,8 @@ { "dest": ".config/modules/retrobios/install.py", "repo_path": "install.py", - "size": 624453, - "sha256": "6cf53f4fb49a96cbb6a13a0517a51440ea86f873fcc711158638db9b41217f64", + "size": 624596, + "sha256": "ebd49c716385fbbb440e10a324776a4a0b3803e2b1e8a6a32325e766891a719e", "executable": false }, {