Allow cancels in some places and update some dialog text

diff --git a/lang/english.trans b/lang/english.trans
index eb9596a..2ce9f96 100644 (file)
--- a/lang/english.trans
+++ b/lang/english.trans
@@ -15,7 +15,7 @@ _OnlyOne="\nOnly one partition available"
 
 # Welcome
 _WelTitle="Welcome to"
-_WelBody="\nThis will unpack and help you setup $DIST on your system.\n\n\nMenu Navigation:\n\n - Select items by pressing the option number or using the arrow keys.\n - Use [Space] to (de)select options and [Enter] to confirm.\n - Switch between buttons using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages\n - Press the highlighted key of an option will select that option.\n"
+_WelBody="\nThis will unpack and help you setup $DIST on your system.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the option number.\n - Use [Space] to toggle options and [Enter] to confirm.\n - Switch between buttons using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages\n - Press the highlighted key of an option to select it.\n"
 
 # Requirements
 _NotRoot="\nThis installer must be run as root or using sudo.\n"
@@ -24,14 +24,14 @@ _NoNetwork="\nThis installer needs to be run with an active internet connection
 
 # Preparation Menu
 _PrepTitle="Prepare System for Install"
-_PrepBody="\nThis is the menu in which you will prepare your system for the install.\n\nTo begin the install you must first have:\n\n  - A root (/) partition mounted (UEFI systems also require a seperate boot partition)\n  - System settings must be configured\n  - A new user must be created and the passwords set.\n\nIf you have already created your partition(s) there is no need to use the edit partition step, simply move on to mounting."
+_PrepBody="\nThis is the menu in which you will prepare your system for the install.\n\nTo begin the install you must first have:\n\n  - A root (/) partition mounted (UEFI systems also require a seperate boot partition).\n  - A new user must be created and the passwords set.\n  - The System settings must be configured.\n\nAlready created your partition(s)? Move on to mounting."
 _PrepLayout="Select keyboard layout"
 _PrepShowDev="Show device tree (optional)"
 _PrepParts="Edit partitions (optional)"
 _PrepLUKS="LUKS encryption (optional)"
 _PrepLVM="Logical volume management (optional)"
 _PrepMount="Mount and format partitions"
-_PrepUser="Create user and set root password"
+_PrepUser="Create user and set passwords"
 _PrepConfig="Configure system settings"
 _PrepWM="Select window manager or desktop (optional)"
 _PrepPkg="Select additional packages (optional)"

diff --git a/src/archlabs-installer b/src/archlabs-installer
index 82bf5d7..d6a7c2c 100755 (executable)
--- a/src/archlabs-installer
+++ b/src/archlabs-installer
@@ -333,7 +333,7 @@ cfg_menu()
     fi
 
     tput civis
-    if ! LOCALE="$(dialog --cr-wrap --no-cancel --stdout --backtitle "$BT" \
+    if ! LOCALE="$(dialog --cr-wrap --stdout --backtitle "$BT" \
         --title " $_ConfLocale " --menu "$_LocaleBody" 0 0 $((LINES - 20)) $LOCALES)"; then
         return 1
     fi
@@ -400,7 +400,7 @@ mkuser()
 select_keymap()
 {
     tput civis
-    if ! KEYMAP="$(dialog --cr-wrap --no-cancel --stdout --backtitle "$BT" \
+    if ! KEYMAP="$(dialog --cr-wrap --stdout --backtitle "$BT" \
         --title " $_PrepLayout " --menu "$_XMapBody" 0 0 $((LINES - 20)) \
         'us' 'English'    'cm'    'English'     'gb' 'English'    'au' 'English'    'gh' 'English' \
         'za' 'English'    'ng'    'English'     'ca' 'French'     'cd' 'French'     'gn' 'French' \
@@ -429,7 +429,7 @@ select_keymap()
     if [[ $CMAPS == *"$KEYMAP"* ]]; then
         CMAP="$KEYMAP"
     else
-        if ! CMAP="$(dialog --cr-wrap --no-cancel --stdout --backtitle "$BT" \
+        if ! CMAP="$(dialog --cr-wrap --stdout --backtitle "$BT" \
             --title " $_CMapTitle " --menu "$_CMapBody" 0 0 $((LINES - 17)) $CMAPS)"; then
             return 1
         fi
@@ -459,7 +459,7 @@ select_timezone()
         return 1
     fi
 
-    if ! SUBZONE="$(dialog --cr-wrap --no-cancel --stdout --backtitle "$BT" \
+    if ! SUBZONE="$(dialog --cr-wrap --stdout --backtitle "$BT" \
         --title " $_TimeZTitle " --menu "$_TimeSubZBody" 0 0 $((LINES - 17)) ${SUBZONES[$ZONE]})"; then
         return 1
     fi
@@ -800,7 +800,7 @@ select_extra()
 
 format()
 {
-    infobox "$_FSTitle" "\nRunning: ${FS_CMDS[$2]} $1\n" 0
+    infobox "$_FSTitle" "\nRunning: ${FS_CMDS[$2]} $1\n" 1
     ${FS_CMDS[$2]} "$1" >/dev/null 2>$ERR
     errshow "${FS_CMDS[$2]} $1"
 }
@@ -2605,7 +2605,7 @@ menubox()
     local body="$2"
     shift 2
     local response
-    if ! response="$(dialog --cr-wrap --no-cancel --stdout --backtitle "$BT" --title " $title " --menu "$body" 0 0 0 "$@")"
+    if ! response="$(dialog --cr-wrap --stdout --backtitle "$BT" --title " $title " --menu "$body" 0 0 0 "$@")"
     then
         return 1
     fi
@@ -2618,7 +2618,7 @@ checkbox()
     local body="$2"
     shift 2
     local response
-    if ! response="$(dialog --cr-wrap --no-cancel --stdout --backtitle "$BT" --title " $title " --checklist "$body" 0 0 0 "$@")"
+    if ! response="$(dialog --cr-wrap --stdout --backtitle "$BT" --title " $title " --checklist "$body" 0 0 0 "$@")"
     then
         return 1
     fi