From da9808e26e2336a00545c7d03cfff3940c71e9ad Mon Sep 17 00:00:00 2001 From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com> Date: Mon, 9 Nov 2026 17:21:09 +0100 Subject: [PATCH] docs: restore installer prose lost in a merge The merge of 6c1446886 took one side of wiki/installer.md for its generated samples and dropped four hand-written changes from the other (folder browser text, --restore row, muOS card text, a kept-file sample). Redone as a three-way merge, samples regenerated. --- wiki/installer.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/installer.md b/wiki/installer.md index 7c0a297a7..fc77eb2e3 100644 --- a/wiki/installer.md +++ b/wiki/installer.md @@ -185,7 +185,7 @@ downloads, the folder and, for a list with files read from the frontend's save directory, that directory. Each row names the option it sets, and **Show the command line** gives the same choice as one command for a script. **Preview the file list** shows what would be downloaded and writes nothing. **Copy the BIOS -files from your old card or a folder** opens the folder browser on the first +files from an old card or a folder** opens the folder browser on the first mounted card, and adds [`--from`](#copy-from-an-old-card): the plan then says how many files that folder holds and how many are left to download, or that it holds none of them. After an install @@ -662,7 +662,7 @@ nothing is replaced. The end of the run says how many files were kept, their size, the folder, and the command that puts them back: ``` -Kept 1 file you had (512.0 KB), which the collection's copies replaced, in /home/me/.config/retroarch/retrobios-backup/20261022-153000 +Kept 1 file already there (512.0 KB), which the collection's copies replaced, in /home/me/.config/retroarch/retrobios-backup/20261022-153000 To put them back: python3 install.py --restore /home/me/.config/retroarch/retrobios-backup/20261022-153000 ``` @@ -1007,7 +1007,7 @@ what the options name, everything by default. | `--from-pack PATH` | Install from a pack already downloaded: its ZIP, one of its parts (the others are found in the same folder), or the folder holding them. Makes no network request and checks every file's hash. See [Without a network](#without-a-network-offline-install) | | `--offline` | Make no network request. `--check`, `--from`, `--from-pack` and `--manifest` work without one, the file list stops the run at once when none of them gives it, and a file the run would download fails at once. `RETROBIOS_INSTALL_OFFLINE=1` does the same. `--target` and `--list-targets` read the core list per board a pack carries, or `targets/.json` beside `--manifest`, and are refused when neither gives one | | `--manifest FILE` | Read the file list from FILE, a copy of `install/.json`, instead of downloading it. See [Without a network](#without-a-network-offline-install) | -| `--restore FOLDER` | Put back the files a run replaced and kept in FOLDER, a dated folder inside `retrobios-backup`. Takes no other option but `--dry-run` and `--no-input`. See [Files you already had](#files-you-already-had) | +| `--restore FOLDER` | Put back the files a run replaced and kept in FOLDER, a dated folder inside `retrobios-backup`. Takes no other option but `--dry-run` and `--no-input`. See [Files already in the folder](#files-you-already-had) | | `--tui` | Open the full-screen interface, or stop with the reason it cannot open here (code 2) instead of falling back to the questions. Wins over `RETROBIOS_PLAIN` and `ACCESSIBLE`. See [The full-screen interface](#the-full-screen-interface) | | `--plain` | Ask the questions line by line instead of the full-screen interface, the mode for a screen reader. See [The full-screen interface](#the-full-screen-interface) | | `--version` | Print the installer's identity, the first 12 hex digits of the SHA-256 the bootstraps pin | @@ -1573,7 +1573,7 @@ it names the pack and the folder. The releases carry no pack for ROCKNIX, Knulli or AmberELEC: there RetroBIOS needs Wi-Fi, or the computer route. On a two-card device, RetroBIOS without Wi-Fi first asks to **copy the BIOS -files from your other card**: muOS's `MUOS/bios` on the card the system does +files from the other card**: muOS's `MUOS/bios` on the card the system does not read, or the other of `/roms/bios` and `/roms2/bios` on ArkOS and dArkOS. A says yes, as [`--from`](#copy-from-an-old-card) does. The list of files still comes from the pack, so the pack is needed too.