version 4.3 - replacing GitHub for Wiki on main menu

Author: psygreg

.gitignore

@@ -10,9 +10,7 @@
 debhelper-build-stamp
 
 # Debian build files
-/src/buildfiles/deb/linuxtoys/DEBIAN/opt/linuxtoys/*
-/src/buildfiles/deb/linuxtoys/DEBIAN/usr
-/src/buildfiles/deb/linuxtoys/DEBIAN/.debhelper
+/src/buildfiles/deb/linuxtoys-*/debian/.debhelper
 /src/buildfiles/deb/linuxtoys/DEBIAN/linuxtoys
 /src/buildfiles/deb/*.deb
 
@@ -28,3 +26,9 @@ debhelper-build-stamp
 /src/buildfiles/pkgbuild/pkg
 /src/buildfiles/pkgbuild/src
 /src/buildfiles/pkgbuild/linuxtoys-*.tar.*
+
+# AppImage build files
+/appimagebuild/LinuxToys.AppDir/etc/*
+/appimagebuild/LinuxToys.AppDir/usr/lib64/*
+/appimagebuild/LinuxToys.AppDir/usr/bin/*
+/LinuxToys_-x86_64*

appimage/linuxtoys.sh

@@ -11,7 +11,7 @@ sudo_rq () {
 }
 
 # updater
-current_ltver="4.2"
+current_ltver="4.3"
 ver_upd () {
     local ver
     ver=$(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/ver)
@@ -56,7 +56,7 @@ while true; do
         "$msg279" \
         "" \
         "$msg124" \
-        "GitHub" \
+        "Wiki" \
         "${msg275}" \
         "$msg059" \
         --height=530 --width=360)
@@ -77,7 +77,7 @@ while true; do
     "$msg279") subscript="psypicks" && _invoke_ ;;
     # 7) subscript="uniwine" && _invoke_ ;; -- disabled option
     "$msg124") zeninf "$msg125";;
-    "GitHub") xdg-open https://github.com/psygreg/linuxtoys ;;
+    "Wiki") xdg-open https://github.com/psygreg/linuxtoys/wiki ;;
     "${msg275}") xdg-open https://ko-fi.com/psygreg ;;
     "$msg059") break ;;
     *) echo "Invalid Option" ;;

appimagebuild/LinuxToys.AppDir/usr/bin/linuxtoys

@@ -1,16 +1,23 @@
 #!/bin/bash
 # functions
+fatal() {
+    zenity --error --title "Fatal Error" --text "$1" --height=300 --width=300
+    exit 1
+}
+
+# sudo request
+sudo_rq () {
+    zenity --password | sudo -Sv || fatal "Wrong password. Do you have sudo?"
+}
 
 # updater
-current_ltver="3.2"
+current_ltver="4.3"
 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
@@ -20,53 +27,59 @@ ver_upd () {
 # check internet connection
 # ping google
 . /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; }
+wget -q -O - "https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/README.md" > /dev/null || fatal "LinuxToys requires an internet connection to proceed."
 # call linuxtoys turbobash lib
-source <(curl -s https://raw.githubusercontent.com/psygreg/linuxtoys/refs/heads/main/src/linuxtoys.lib)
+sleep 1
+source 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})
+source ${langfile}
+sleep 1
 ver_upd
+sudo_rq
 
 # 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" \
+        "$msg279" \
+        "" \
+        "$msg124" \
+        "Wiki" \
+        "${msg275}" \
+        "$msg059" \
+        --height=530 --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_ ;;
+    "$msg279") subscript="psypicks" && _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";;
+    "Wiki") xdg-open https://github.com/psygreg/linuxtoys/wiki ;;
+    "${msg275}") xdg-open https://ko-fi.com/psygreg ;;
+    "$msg059") break ;;
     *) echo "Invalid Option" ;;
     esac
 done

src/buildfiles/deb/builddeb.sh

@@ -2,20 +2,20 @@
 # ask version to package
 read -p "Version number: " lt_version
 # set up dir structure
-mkdir -p linuxtoys_${lt_version}.orig/usr || echo "fatal error 1" && sleep 3 && exit 1
-mv linuxtoys-* linuxtoys-${lt_version} || echo "fatal error 2" && sleep 3 && exit 2
-cp -r linuxtoys-${lt_version}/debian/usr/* linuxtoys_${lt_version}.orig/usr
-tar -cJf linuxtoys_${lt_version}.orig.tar.xz linuxtoys_${lt_version}.orig/
+mkdir -p linuxtoys_$lt_version.orig/usr
+mv linuxtoys-* linuxtoys-$lt_version 
+cp -rf linuxtoys-$lt_version/debian/usr/* linuxtoys_$lt_version.orig/usr
+tar -cJf linuxtoys_$lt_version.orig.tar.xz linuxtoys_$lt_version.orig/
 # set changelog file
 day=$(date +%d)
-day_abbr=$(date +%a)
-month=$(date +%b)  
+day_abbr=$(LC_TIME=C date +%a)  # This will always be in English
+month=$(LC_TIME=C date +%b)
 year=$(date +%Y)
 changelog_line="linuxtoys (${lt_version}-1) noble; urgency=medium"
 changelog_line2=" -- Victor Gregory <[email protected]>  ${day_abbr}, ${day} ${month} ${year} 3:00:47 -0300"
 sed -i "1c\\$changelog_line" linuxtoys-${lt_version}/debian/changelog
 sed -i "5c\\$changelog_line2" linuxtoys-${lt_version}/debian/changelog
 # build package
-cd linuxtoys-${lt_version} || echo "fatal error 3" && sleep 3 && exit 3
+cd linuxtoys-${lt_version}
 debuild -us -uc # this builder script requires devscripts!!
 echo "All done" && sleep 3 && exit 0

src/buildfiles/deb/linuxtoys-4.2/debian/changelog

@@ -0,0 +1,5 @@
+linuxtoys (4.3-1) noble; urgency=medium
+
+  * Distribution packaging reinstated
+
+ -- Victor Gregory <[email protected]>  sáb, 09 ago 2025 3:00:47 -0300

src/buildfiles/deb/linuxtoys-4.2/debian/files

@@ -0,0 +1,2 @@
+linuxtoys_4.3-1_amd64.buildinfo utils optional
+linuxtoys_4.3-1_amd64.deb utils optional