CHANGELOG

@@ -12,8 +12,6 @@ Environment Changes:
 - added grub bli efi module
 - use BLAKE2b/b2sum instead of sha256sum
 - shortened MOTD and init message
-- ask basic environment settings on first login
-- added launcher script
 locale:
 - fixed abort dialog
 update:

usr/bin/archboot-launcher.sh

@@ -15,25 +15,24 @@ _dialog() {
 }
 
 _dolauncher() {
-    _dialog --title " Main Menu " --menu "" 10 40 6 \
+    _dialog --title " Main Menu " --menu "" 9 40 5 \
     "1" "Launch Archboot Setup" \
     "2" "Launch Desktop Environment" \
-    "3" "Manage Archboot Environment" \
-    "4" "Exit Program" 2>${_ANSWER}
+    "3" "Exit Program" 2>${_ANSWER}
     case $(cat ${_ANSWER}) in
         "1")
             [[ -e /tmp/.launcher-running ]] && rm /tmp/.launcher-running
             setup
             exit 0 ;;
         "2")
-            _LAUNCHER=()
-            update | grep -q Gnome && _LAUNCHER+=( "GNOME" "Gnome - Simple Beautiful Elegant" )
-            update | grep -q KDE && _LAUNCHER+=( "PLASMA" "KDE/Plasma - Simple By Default" )
-            update | grep -q Sway && _LAUNCHER+=( "SWAY" "Sway - Tiling Wayland Compositor" )
-            update | grep -q Xfce && _LAUNCHER+=( "XFCE" "Xfce - Leightweight Desktop" )
+            _LAUNCHER=""
+            update | grep -q Gnome && _LAUNCHER="${_LAUNCHER} GNOME Gnome"
+            update | grep -q KDE && _LAUNCHER="${_LAUNCHER} PLASMA KDE/Plasma"
+            update | grep -q Sway && _LAUNCHER="${_LAUNCHER} SWAY Sway"
+            update | grep -q Xfce && _LAUNCHER="${_LAUNCHER} XFCE Xfce"
             _ABORT=""
-            if [[ -n "${_LAUNCHER[@]}" ]]; then
-                _dialog --title " Desktop Menu " --menu "" 10 50 6 "${_LAUNCHER[@]}" 2>${_ANSWER} || _ABORT=1
+            if [[ -n "${_LAUNCHER}" ]]; then
+                _dialog --title " Desktop Menu " --menu "" 10 30 6 ${_LAUNCHER} 2>${_ANSWER} || _ABORT=1
             else
                 _dialog --msgbox "Error:\nNo Desktop Environments available." 0 0
                 _ABORT=1
@@ -70,37 +69,6 @@ _dolauncher() {
             exit 0
             ;;
         "3")
-            _LAUNCHER=()
-            update | grep -q full && _LAUNCHER+=( "FULL" "Switch To Full Arch Linux System" )
-            update | grep -q latest && _LAUNCHER+=( "UPDATE" "Update Archboot Environment" )
-            update | grep -q image && _LAUNCHER+=( "IMAGE" "Create New Images" )
-            _ABORT=""
-            if [[ -n "${_LAUNCHER[@]}" ]]; then
-                _dialog --title " Manage Archboot Menu " --menu "" 9 60 5 "${_LAUNCHER[@]}" 2>${_ANSWER} || _ABORT=1
-            else
-                _dialog --msgbox "Error:\nNo management options available." 0 0
-                _ABORT=1
-            fi
-            clear
-            [[ -e /tmp/.launcher-running ]] && rm /tmp/.launcher-running
-            if [[ -n "${_ABORT}"  ]]; then
-                exit 1
-            fi
-            _EXIT="$(cat ${_ANSWER})"
-            if [[ "${_EXIT}" == "FULL" ]]; then
-                update -full-system
-            elif [[ "${_EXIT}" == "UPDATE" ]]; then
-                if update | grep -q latest-install; then
-                    update -latest-install
-                else
-                    update -latest
-                fi
-            elif [[ "${_EXIT}" == "IMAGE" ]]; then
-                update -latest-image
-            fi
-            exit 0
-            ;;
-        "4")
             #shellcheck disable=SC2086
             _dialog --title " EXIT MENU " --menu "" 9 30 5 \
             "1" "Exit Program" \
@@ -143,8 +111,5 @@ if ! _dolauncher; then
 fi
 [[ -e /tmp/.launcher-running ]] && rm /tmp/.launcher-running
 clear
-agetty --show-issue
-echo ""
-cat /etc/motd
 exit 0
 # vim: set ts=4 sw=4 et: