| Revision | caf5290f4d784ca8266fccdcec66dfc9be3c8842 (tree) |
|---|---|
| Time | 2019-10-28 05:43:20 |
| Author | natemaia <natemaia10@gmai...> |
| Commiter | natemaia |
Fix: wrong variable being assigned to for user command
archlabs-installer (diff)| @@ -8,7 +8,7 @@ | ||
| 8 | 8 | # check for syntax errors |
| 9 | 9 | # set -n |
| 10 | 10 | |
| 11 | -VER=2.0.91 | |
| 11 | +VER=2.0.92 | |
| 12 | 12 | |
| 13 | 13 | # default values { |
| 14 | 14 |
| @@ -137,7 +137,7 @@ _sessions="\nUse [Space] to toggle available sessions, use [Enter] to accept the | ||
| 137 | 137 | _login="\nSelect which of your session choices to use for the initial login.\n\nYou can be change this later by editing your ~/.xinitrc" |
| 138 | 138 | _autologin="\nDo you want autologin enabled for USER?\n\nIf so the following two files will be created (disable autologin by removing them):\n\n - /home/USER/RC (run startx when logging in on tty1)\n - /etc/systemd/system/getty@tty1.service.d/autologin.conf (login USER without password)\n" |
| 139 | 139 | _packages="\nUse [Space] to move a package into the selected area and press [Enter] to accept the selection.\n\nPackages may be installed by your DE/WM (if any), or for the packages you select." |
| 140 | -_usercmd="\nEnter command(s) to be run in the newly installed system (chroot).\n\nAn example use case would be installing packages or editing files not offered in the menus.\n\nBecause the command will be run in a chroot not everything may function correctly, additionally the command will not be sanity checked, it's your system so exercise caution.\n\nYou may string more than one command together by using standard bash syntax.\n" | |
| 140 | +_usercmd="\nEnter command to be run in the newly installed system (chroot) below.\n\nAn example use case would be installing packages or editing files not offered in the menus.\n\nBecause the command will be run in a chroot not every command will function correctly, additionally the command will not be sanity checked, it's your system so exercise caution.\n\nMore than one command may be run using standard bash syntax.\n" | |
| 141 | 141 | _edit="\nBefore exiting you can select configuration files to review/change.\n\nIf you need to make other changes with the drives still mounted, use Ctrl-z to pause the installer, when finished type 'fg' and [Enter] to resume the installer, if you want to avoid the automatic reboot using Ctrl-c will cleanly exit." |
| 142 | 142 | |
| 143 | 143 | # LUKS |
| @@ -181,17 +181,17 @@ main() | ||
| 181 | 181 | tput civis |
| 182 | 182 | dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " --default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \ |
| 183 | 183 | 1 "Show device tree" \ |
| 184 | - 2 "Partitioning helpers" \ | |
| 185 | - 3 "LUKS encryption setup" \ | |
| 186 | - 4 "Logical volume management setup" \ | |
| 187 | - 5 "* Mount system partitions" \ | |
| 188 | - 6 "* Select system bootloader" \ | |
| 189 | - 7 "* Create user and password" \ | |
| 190 | - 8 "* Basic system configuration" \ | |
| 184 | + 2 "Partitioning" \ | |
| 185 | + 3 "LUKS encryption" \ | |
| 186 | + 4 "Logical volume management" \ | |
| 187 | + 5 "* Mount partitions" \ | |
| 188 | + 6 "* Select bootloader" \ | |
| 189 | + 7 "* Username and password" \ | |
| 190 | + 8 "* System configuration" \ | |
| 191 | 191 | 9 "Select window manager or desktop" \ |
| 192 | 192 | 10 "Select additional packages" \ |
| 193 | 193 | 11 "View configuration selections" \ |
| 194 | - 12 "Add a command to be run on the system during install" \ | |
| 194 | + 12 "Run a command on the installed system" \ | |
| 195 | 195 | 13 "* Confirm choices and start the installation" 2> "$ANS" |
| 196 | 196 | |
| 197 | 197 | read -r SEL < "$ANS" |
| @@ -419,7 +419,7 @@ select_keymap() | ||
| 419 | 419 | |
| 420 | 420 | select_usercmd() |
| 421 | 421 | { |
| 422 | - dlg MYHOST input "User Command" "$_usercmd" "$USER_CMD" nolimit | |
| 422 | + dlg USER_CMD input "User Command" "$_usercmd" "$USER_CMD" nolimit | |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | select_sessions() |
Fork