From 94ccb4ac0f84225ed1d006bf3012507c6fda9421 Mon Sep 17 00:00:00 2001 From: natemaia Date: Sun, 17 May 2020 12:34:28 -0700 Subject: [PATCH] Update welcome --- installer | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/installer b/installer index 17cad6a..65e9cd3 100755 --- a/installer +++ b/installer @@ -306,7 +306,6 @@ declare -A PKG_EXT=( # dialog text variables { # Basics (somewhat in order) -_welcome="\nThis will help you get $DIST installed and setup on your system.\n\nIf you are unsure about a section the default option will be listed or\nthe first selected item will be the default.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the option number.\n - Use [Space] to toggle check boxes and [Enter] to accept.\n - Switch between fields 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" _keymap="\nSelect which keymap to use from the list below.\n\nThis will determine the installed system keymap, NOT locale which is chosen later.\n\nSystem default: us" _vconsole="\nSelect the console keymap, the console is the tty shell you reach before starting a graphical environment (Xorg).\n\nIts keymap is separate from the one used by the graphical environments, though many do use the same such as 'us' English.\n\nSystem default: us" _prep="\nThis is the installer main menu, once a step is complete you will return here.\n\nOn successful completion of a step the cursor will be advanced to the next step\nOn failure the cursor will be placed on the step required to advance (when possible).\n\nSteps beginning with an asterisk (*) are required.\n\nOnce you're happy with the choices and the required steps are complete, selecting the final step will begin the install." @@ -3270,10 +3269,10 @@ if [[ $MISS ]]; then printf "This installer requires the following package(s) to be installed:\n\n\t%s" "$MISS" die 1 elif (( UID != 0 )); then - msg "Not Root" "\nThis installer must be run as root or using sudo.\n\nExiting..\n" 2 + msg "Not Root" "\nThis installer must be run as root.\n\nExiting..\n" 2 die 1 -elif ! grep -qwm 1 'lm' /proc/cpuinfo; then - msg "Not x86_64 Architecture" "\nThis installer only supports x86_64 architectures.\n\nExiting..\n" 2 +elif ! grep -qm 1 ' lm ' /proc/cpuinfo; then + msg "Not x86_64" "\nThis installer only supports x86_64 architectures.\n\nExiting..\n" 2 die 1 fi @@ -3353,7 +3352,7 @@ fi # welcome once if [[ ! -f /tmp/weld ]]; then - msg "Welcome to the $DIST Installer" "$_welcome" + msg "Welcome to the $DIST Installer" "\nThis will help you get $DIST installed and setup on your system.\n\nIf you are unsure about an option, the default or most common\nwill be mentioned or the first selected entry will be the default.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the option number.\n - Use [Space] to toggle check boxes and [Enter] to accept.\n - Switch between fields 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" touch /tmp/weld fi