update source to 4.0

Author: psygreg

src/linuxtoys.sh

@@ -2,15 +2,13 @@
 # functions
 
 # updater
-current_ltver="3.2"
+current_ltver="4.0"
 ver_upd () {
     local ver
     ver=$(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/ver)
     if [[ "$ver" != "$current_ltver" ]]; then
-        if whiptail --title "$msg001" --yesno "$msg002" 8 78; then
-            local title="$msg001"
-            local msg="$msg157"
-            _msgbox_
+        if zenity --question --title "$msg001" --text "$msg002" --width 300 --height 300; then
+            zeninf "$msg157"
             xdg-open https://github.com/psygreg/linuxtoys/releases/latest         
         fi
     fi
@@ -22,51 +20,54 @@ ver_upd () {
 . /etc/os-release
 wget -q -O - "https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/README.md" > /dev/null || { whiptail --title "Disconnected" --msgbox "LinuxToys requires an internet connection to proceed." 8 78; exit 1; }
 # call linuxtoys turbobash lib
+sleep 1
 source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/linuxtoys.lib)
 # logger
 logfile="$HOME/.local/linuxtoys-log.txt"
 _log_
 # language and upd checks
 _lang_
 source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/lang/${langfile})
+sleep 1
 ver_upd
 
 # main menu
-while :; do
+while true; do
 
-    CHOICE=$(whiptail --title "LinuxToys" --menu "LinuxToys ${current_ltver}" 25 78 16 \
-        "0" "$msg120" \
-        "1" "$msg121" \
-        "2" "$msg122" \
-        "3" "${msg123}*" \
-        "4" "${msg143}*" \
-        "5" "$msg227" \
-        "6" "$msg199" \
-        "" "" \
-        "" "" \
-        "8" "$msg124" \
-        "9" "GitHub" \
-        "10" "$msg059" 3>&1 1>&2 2>&3)
+    CHOICE=$(zenity --list --title "LinuxToys" \
+        --column="$msg274"  \
+        "$msg120" \
+        "$msg121" \
+        "$msg122" \
+        "${msg123}" \
+        "${msg143}" \
+        "$msg227" \
+        "$msg199" \
+        "" \
+        "$msg124" \
+        "GitHub" \
+        "${msg275}" \
+        "$msg059" \
+        --height=500 --width=360)
         #"7" "UniWine" \ -- disabled option
 
-    exitstatus=$?
-    if [ $exitstatus != 0 ]; then
-        # Exit the script if the user presses Esc
-        find "$HOME" -maxdepth 1 -type f -name '*supermenu.sh' -exec rm -f {} + && break
-    fi
+    if [ $? -ne 0 ]; then
+        find "$HOME" -maxdepth 1 -type f -name '*.sh' -exec rm -f {} + && break
+   	fi
 
     case $CHOICE in
-    0) supmenu="usupermenu" && _invoke_ ;;
-    1) supmenu="osupermenu" && _invoke_ ;;
-    2) supmenu="gsupermenu" && _invoke_ ;;
-    3) supmenu="esupermenu" && _invoke_ ;;
-    4) supmenu="dsupermenu" && _invoke_ ;;
-    5) subscript="pdefaults" && _invoke_ ;;
-    6) supmenu="csupermenu" && _invoke_ ;;
+    "$msg120") supmenu="usupermenu" && _invoke_ ;;
+    "$msg121") supmenu="osupermenu" && _invoke_ ;;
+    "$msg122") supmenu="gsupermenu" && _invoke_ ;;
+    "${msg123}") supmenu="esupermenu" && _invoke_ ;;
+    "${msg143}") supmenu="dsupermenu" && _invoke_ ;;
+    "$msg227") subscript="pdefaults" && _invoke_ ;;
+    "$msg199") supmenu="csupermenu" && _invoke_ ;;
     # 7) subscript="uniwine" && _invoke_ ;; -- disabled option
-    8) whiptail --title "LinuxToys v${current_ltver}" --msgbox "$msg125" 8 78 ;;
-    9) xdg-open https://github.com/psygreg/linuxtoys ;;
-    10 | q) break ;;
+    "$msg124") zeninf "$msg125";;
+    "GitHub") xdg-open https://github.com/psygreg/linuxtoys ;;
+    "${msg275}") xdg-open https://ko-fi.com/psygreg ;;
+    "$msg059") break ;;
     *) echo "Invalid Option" ;;
     esac
 done

src/resources/other/kupid/kupid-upd.sh

@@ -4,7 +4,7 @@ source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/
 _lang_
 source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/lang/${langfile})
 # updater
-if whiptail --title "$msg126" --yesno "$msg127" 8 78; then
+if zenity --question --title "$msg126" --text "$msg127" --width 360 --height 300; then
     if [ -f "$HOME/.local/kernelsetting-lts" ]; then
         bash <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/resources/other/psycachy/psycachy-install.sh) --lts
     elif [ -f "$HOME/.local/kernelsetting" ]; then

src/resources/other/psycachy/psycachy-install.sh

@@ -72,18 +72,18 @@ if [ -n "$1" ]; then
 fi
 
 # menu
-while :; do
+while true; do
 
-    CHOICE=$(whiptail --title "Kernel Version" --menu "Select:" 25 78 16 \
-        "Standard" "$kver_psycachy" \
-        "LTS" "$kver_lts" \
-        "Latest" "$_kv_latest" \
-        "Cancel" "" 3>&1 1>&2 2>&3)
+    CHOICE=$(zenity --list --title "Psycachy Kernel Installer" --text "Select the kernel version to install:" \
+        --column "Versions" \
+        "Standard" \
+        "LTS" \
+        "Latest (CachyOS, may not work)" \
+        "Cancel" \
+        --width 360 --height 360 )
 
-    exitstatus=$?
-    if [ $exitstatus != 0 ]; then
-        # Exit the script if the user presses Esc
-        exit 2
+    if [ $? -ne 0 ]; then
+        exit 0
     fi
 
     case $CHOICE in

src/resources/subscripts/android-studio-in.sh

@@ -8,8 +8,7 @@ depcheck () {
     elif [[ "$ID_LIKE" =~ (rhel|fedora) ]] || [[ "$ID" =~ (fedora) ]]; then
         local _packages=(zlib.i686 ncurses-libs.i686 bzip2-libs.i686)
     else
-        local title="Android Studio"
-        local msg="$msg077"
+        nonfatal "$msg077"
         exit 1
     fi
     _install_

src/resources/subscripts/docker-installer.sh

@@ -48,11 +48,9 @@ docker_in () {
 . /etc/os-release
 source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/linuxtoys.lib)
 dep_check
-if whiptail --title "Docker + Portainer CE Setup" --yesno "This will install Docker Engine and Portainer CE to manage it through a web UI. Proceed?" 8 78; then
+if zenity --question --text "This will install Docker Engine and Portainer CE to manage it through a web UI. Proceed?" --width 360 --height 300; then
     docker_in
-    title="Docker + Portainer CE Setup"
-    msg="Setup complete. Your Portainer dashboard will open in your web browser now."
-    _msgbox_
+    zeninf "Setup complete. Your Portainer dashboard will open in your web browser now."
     xdg-open https://localhost:9443
     exit 0
 fi

src/resources/subscripts/grub-btrfs-installer.sh

@@ -5,9 +5,7 @@
 dep_check () {
 
     if ! dpkg -l | grep -q grub-efi; then
-        local title="Cancelled"
-        local msg="No GRUB found."
-        _msgbox_
+        nonfatal "No GRUB found."
         exit 1
     else
         local _packages=()
@@ -82,12 +80,8 @@ grubtrfs_in () {
 . /etc/os-release
 source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/linuxtoys.lib)
 dep_check
-if whiptail --title "Grub-Btrfs Installer" --yesno "This will list snapshots in your GRUB. It will only work if your root filesystem is btrfs. Proceed?" 8 78; then
+if zenity --question --text "This will list snapshots in your GRUB. It will only work if your root filesystem is btrfs. Proceed?" --width 360 --height 300; then
     grubtrfs_in
-    title="Grub-Btrfs Installer"
-    msg="Installation successful."
-    _msgbox_
-    cd ..
-    rm -rf grub-btrfs
+    zeninf "Installation successful."
     exit 0
 fi

src/resources/subscripts/iwdwifi.sh

@@ -26,9 +26,7 @@ iwd_in () {
         sudo systemctl restart NetworkManager
         return 0
     else
-        local title="Cancelled"
-        local msg="No WiFi device found."
-        _msgbox_
+        nonfatal "No WiFi device found."
         return 2
     fi
 
@@ -44,32 +42,30 @@ iwd_rm () {
         sudo systemctl restart NetworkManager
         return 0
     else
-        local title="Cancelled"
-        local msg="iwd.conf file not found. IWD was not enabled in this system."
-        _msgbox_
+        nonfatal "iwd.conf file not found. IWD was not enabled in this system."
         return 1
     fi
 
 }
 
 # menu
-while :; do
+while true; do
 
-    CHOICE=$(whiptail --title "iNet Wireless Daemon" --menu "" 25 78 16 \
-        "0" "Install" \
-        "1" "Remove" \
-        "2" "Cancel" 3>&1 1>&2 2>&3)
+    CHOICE=$(zenity --list --title "iNet Wireless Daemon" \
+        --column="Options" \
+        "Install" \
+        "Remove" \
+        "Cancel" \
+        --height=360 --width=300)
 
-    exitstatus=$?
-    if [ $exitstatus != 0 ]; then
-        # Exit the script if the user presses Esc
+    if [ $? -ne 0 ]; then
         break
     fi
 
     case $CHOICE in
-    0) iwd_in && break;;
-    1) iwd_rm && break;;
-    2 | q) break ;;
+    "Install") iwd_in && break;;
+    "Remove") iwd_rm && break;;
+    "Cancel") break ;;
     *) echo "Invalid Option" ;;
     esac
 

src/resources/subscripts/jetbrainsmenu.lib

@@ -392,7 +392,7 @@ toolbox_in () {
     wget https://download-cdn.jetbrains.com/toolbox/jetbrains-toolbox-2.6.2.41321.tar.gz
     # first installation
     if [ ! -d "/opt/toolbox" ]; then
-        if whiptail --title "Jetbrains Toolbox" --yesno "$msg174" 12 78; then
+        if zenity --question --text "$msg174" --width 360 --height 300; then
             insta fuse
             tar -xvzf jetbrains-toolbox-2.6.2.41321.tar.gz
             sleep 1
@@ -415,9 +415,7 @@ toolbox_in () {
               source ~/.bashrc
             fi
         else
-            local title="$msg030"
-            local msg="$msg175"
-            _msgbox_
+            zeninf "$msg175"
             return
         fi
     else # update

src/resources/subscripts/pdefaults.sh

@@ -31,7 +31,7 @@ optimizer () {
         if [[ "$ID_LIKE" == *debian* ]] || [[ "$ID_LIKE" == *ubuntu* ]] || [ "$ID" == "debian" ] || [ "$ID" == "ubuntu" ]; then
             debfixer_lib
             # summon installer
-            if whiptail --title "CachyOS Kernel" --yesno "$msg150" 12 78; then
+            if zenity --question --text "$msg150" --width 360 --height 300; then
                 psycachy_lib
                 kupid_lib
             fi
@@ -40,43 +40,34 @@ optimizer () {
             dpkg --list | grep -v $(uname -r) | grep -E 'custom-kernel-[0-9]|custom-kernel-headers-[0-9]' | awk '{print $2" "$3}' | sort -k2,2 | head -n -2 | awk '{print $1}' | xargs sudo apt purge
             # run system-agnostic optimizations
             sysag_run
-            local title="$msg006"
-            local msg="$msg036"
-            _msgbox_
+            zeninf "$msg036"
         elif [[ "$ID_LIKE" =~ (rhel|fedora) ]] || [ "$ID" == "fedora" ]; then
-            if whiptail --title "CachyOS Kernel" --yesno "$msg150" 12 78; then
+            if zenity --question --text "$msg150" --width 360 --height 300; then
                 fedora_cachyos_menu_lib
             fi
             # run system-agnostic optimizations
             sysag_run
         elif [[ "$ID" =~ ^(arch)$ ]] || [[ "$ID_LIKE" == *arch* ]] || [[ "$ID_LIKE" == *archlinux* ]]; then
-            if whiptail --title "CachyOS Kernel" --yesno "$msg150" 12 78; then
+            if zenity --question --text "$msg150" --width 360 --height 300; then
                 cachyos_arch_lib
             fi
             # run system-agnostic optimizations
             sysag_run
-            local title="$msg006"
-            local msg="$msg036"
-            _msgbox_
+            zeninf "$msg036"
         elif [ "$ID" == "cachyos" ]; then
             sysag_run
-            local title="$msg006"
-            local msg="$msg036"
-            _msgbox_
+            zeninf "$msg036"
         else
-            local title="$msg074"
-            local msg="$msg077"
-            _msgbox_
+            nonfatal "$msg077"
+            exit 1
         fi
         if echo "$XDG_CURRENT_DESKTOP" | grep -qi 'gnome'; then
             dconf write /org/gnome/mutter/check-alive-timeout "20000"
         fi
         wget https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/resources/other/autopatch.state
         sudo mv autopatch.state /.autopatch.state
     else
-        local title="AutoPatcher"
-        local msg="$msg234"
-        _msgbox_
+        nonfatal "$msg234"
     fi
 
 }
@@ -88,23 +79,23 @@ source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/
 _lang_
 source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/lang/${langfile})
 # menu
-while :; do
+while true; do
 
-    CHOICE=$(whiptail --title "Power Optimizer" --menu "$msg229" 25 78 16 \
-        "0" "Desktop" \
-        "1" "Laptop" \
-        "2" "Cancel" 3>&1 1>&2 2>&3)
+    CHOICE=$(zenity --list --title "Power Optimizer" --text "$msg229" \
+        --column "Options" \
+        "Desktop" \
+        "Laptop" \
+        "Cancel" \
+        --width 300 --height 330 )
 
-    exitstatus=$?
-    if [ $exitstatus != 0 ]; then
-        # Exit the script if the user presses Esc
-        break
+    if [ $? -ne 0 ]; then
+        exit 0
     fi
 
     case $CHOICE in
-    0) optimizer && break ;;
-    1) optimizer && psave_lib && break ;;
-    2 | q) break ;;
+    "Desktop") optimizer && break ;;
+    "Laptop") optimizer && psave_lib && break ;;
+    "Cancel") break ;;
     *) echo "Invalid Option" ;;
     esac
 done