From 9220c6478069b4907d080a3623d7e75757bca2da Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 10 Nov 2022 22:27:23 +0100 Subject: [PATCH] whiptail broken, switching to dialog --- config/accounts/menu | 2 +- config/accounts/sudoers/menu | 8 +++--- config/accounts/users/menu | 6 ++-- config/bash/aliases | 2 +- config/bash/editor | 2 +- config/bash/menu | 2 +- config/bash/ps1 | 2 +- config/boot/grub/menu | 2 +- config/boot/initcpio/menu | 4 +-- config/boot/menu | 2 +- config/boot/refind/menu | 2 +- config/boot/syslinux/menu | 2 +- config/boot/systemd/entries | 10 +++---- config/boot/systemd/menu | 2 +- config/firewall/menu | 2 +- config/menu | 2 +- config/systemd/menu | 2 +- config/systemd/services/menu | 12 ++++---- config/systemd/timedatectl/menu | 2 +- config/xorg/keyboard | 8 +++--- config/xorg/menu | 2 +- install/apps/dev/dev | 2 +- install/apps/graphic/graphic | 4 +-- install/apps/internet/mail | 4 +-- install/apps/internet/menu | 2 +- install/apps/internet/torrent | 4 +-- install/apps/internet/webbrowser | 10 +++---- install/apps/menu | 2 +- install/apps/multimedia/audioplayer | 8 +++--- install/apps/multimedia/burnertools | 6 ++-- install/apps/multimedia/gstreamer | 2 +- install/apps/multimedia/menu | 2 +- install/apps/multimedia/videoplayer | 4 +-- install/apps/multimedia/videotools | 2 +- install/apps/office/menu | 2 +- install/apps/office/office | 8 +++--- install/apps/office/office-language-aids | 20 ++++++------- install/apps/office/office-tools | 2 +- install/apps/pacmangui/pacmangui | 2 +- install/apps/system/system | 2 +- install/apps/tmp/dev | 2 +- install/apps/tmp/games | 2 +- install/apps/tmp/network | 2 +- install/console/compression-tools | 2 +- install/console/generic | 6 ++-- install/console/menu | 2 +- install/console/network-tools | 4 +-- install/console/recovery-tools | 2 +- install/console/webbrowser | 2 +- install/desktop/cinnamon/menu | 2 +- install/desktop/cinnamon/packages | 2 +- install/desktop/deepin/menu | 2 +- install/desktop/deepin/packages | 2 +- install/desktop/enlightenment/packages | 2 +- install/desktop/gnome/menu | 2 +- install/desktop/gnome/packages | 2 +- install/desktop/lxde-gtk3/packages | 4 +-- install/desktop/lxde/packages | 4 +-- install/desktop/lxqt/complements | 6 ++-- install/desktop/lxqt/menu | 2 +- install/desktop/lxqt/packages | 2 +- install/desktop/mate/menu | 2 +- install/desktop/mate/packages | 2 +- install/desktop/menu | 2 +- install/desktop/openbox/packages | 2 +- install/desktop/plasma5/complements | 2 +- install/desktop/plasma5/kdeapps/kdeapps | 2 +- install/desktop/plasma5/kdeapps/menu | 2 +- install/desktop/plasma5/kdeapps/metapackages | 2 +- .../desktop/plasma5/kdeapps/packagecategories | 2 +- install/desktop/plasma5/kdeapps/packages | 2 +- install/desktop/plasma5/kdeplasma | 2 +- install/desktop/plasma5/menu | 2 +- install/desktop/plasma5/plasma-packages | 4 +-- install/desktop/xfce4/complements | 4 +-- install/desktop/xfce4/menu | 2 +- install/desktop/xfce4/packages | 2 +- install/displaymngr/menu | 2 +- install/menu | 2 +- install/system/filesystem | 4 +-- install/system/kernel/linux | 2 +- install/system/kernel/linux-hardened | 2 +- install/system/kernel/linux-lts | 2 +- install/system/kernel/linux-zen | 2 +- install/system/kernel/menu | 2 +- install/system/menu | 2 +- install/system/print | 6 ++-- install/system/services/menu | 28 +++++++++---------- install/system/sound/menu | 2 +- install/system/sound/pipewire-media-session | 2 +- install/system/sound/pulseaudio | 2 +- install/system/sound/wireplumper | 2 +- install/xorg/complements/complements | 4 +-- install/xorg/fonts/default | 2 +- install/xorg/fonts/menu | 2 +- install/xorg/fonts/ttf | 4 +-- install/xorg/input-drivers/input-drivers | 14 +++++----- install/xorg/install | 2 +- install/xorg/menu | 4 +-- install/xorg/video-drivers/menu | 2 +- install/xorg/video-drivers/open-source | 2 +- install/xorg/video-drivers/proprietary | 6 ++-- lib | 6 ++-- menu | 2 +- shutdown/menu | 2 +- updates/menu | 10 +++---- 106 files changed, 191 insertions(+), 191 deletions(-) diff --git a/config/accounts/menu b/config/accounts/menu index 47d1fbd..b846690 100644 --- a/config/accounts/menu +++ b/config/accounts/menu @@ -6,7 +6,7 @@ options+=("Users" "") options+=("Sudoers" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Accounts Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Accounts Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/accounts/sudoers/menu b/config/accounts/sudoers/menu index e47e01f..6f7435f 100644 --- a/config/accounts/sudoers/menu +++ b/config/accounts/sudoers/menu @@ -9,7 +9,7 @@ options+=("" "") options+=("Edit /etc/sudoers" "") defaultitem="Add sudoer" -sel=$(whiptail --backtitle "$apptitle" --title "Sudoers Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Sudoers Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -24,7 +24,7 @@ case $sel in for itm in $users; do userlist+=("$itm" "") done - sel=$(whiptail --backtitle "$apptitle" --title "Add sudoer :" --menu "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Add sudoer :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${userlist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -39,7 +39,7 @@ case $sel in sudoerlist+=("$itm" "") fi done - sel=$(whiptail --backtitle "$apptitle" --title "Edit sudoer :" --menu "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Edit sudoer :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${sudoerlist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -54,7 +54,7 @@ case $sel in sudoerlist+=("$itm" "") fi done - sel=$(whiptail --backtitle "$apptitle" --title "Delete sudoer :" --menu "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Delete sudoer :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${sudoerlist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then diff --git a/config/accounts/users/menu b/config/accounts/users/menu index 0b96ae7..64b024c 100644 --- a/config/accounts/users/menu +++ b/config/accounts/users/menu @@ -7,7 +7,7 @@ options+=("List Users" "") options+=("Delete User" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Users Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Users Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -22,7 +22,7 @@ case $sel in read -n1 -p "press a key to continue" ;; 'Add User') - username=$(whiptail --backtitle "$apptitle" --title "Add User" --inputbox "Enter the new user name :" 0 0 3>&1 1>&2 2>&3) + username=$(dialog --backtitle "$apptitle" --title "Add User" --inputbox "Enter the new user name :" 0 0 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then useradd -d /home/$username -s /bin/bash -m -N $username clear @@ -36,7 +36,7 @@ case $sel in fi ;; 'Delete User') - username=$(whiptail --backtitle "$apptitle" --title "Delete User" --inputbox "Enter the user name to delete :" 0 0 3>&1 1>&2 2>&3) + username=$(dialog --backtitle "$apptitle" --title "Delete User" --inputbox "Enter the user name to delete :" 0 0 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then userdel -r -f $username grpck diff --git a/config/bash/aliases b/config/bash/aliases index 3ee553d..404e260 100644 --- a/config/bash/aliases +++ b/config/bash/aliases @@ -41,7 +41,7 @@ if [ -f /usr/bin/yaourt ]; then options+=("yaourt(3)" "yaourt --color" off) fi -sel=$(whiptail --backtitle "$apptitle" --title "Aliases in /etc/profile.d/alias.sh :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Aliases in /etc/profile.d/alias.sh :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/bash/editor b/config/bash/editor index 12f9ad6..68af19e 100644 --- a/config/bash/editor +++ b/config/bash/editor @@ -16,7 +16,7 @@ if [ -f /usr/bin/edit ]; then fi options+=("unset" "") -editor=$(whiptail --backtitle "$apptitle" --title "Default global editor :" --menu "" --cancel-button "Back" 0 0 0 \ +editor=$(dialog --backtitle "$apptitle" --title "Default global editor :" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/bash/menu b/config/bash/menu index a9deb67..38255ea 100644 --- a/config/bash/menu +++ b/config/bash/menu @@ -8,7 +8,7 @@ options+=("/etc/profile.d/ps1.sh" "") options+=("Update .bashrc" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Bash Configuration :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Bash Configuration :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/bash/ps1 b/config/bash/ps1 index e970f65..6d2afd2 100644 --- a/config/bash/ps1 +++ b/config/bash/ps1 @@ -6,7 +6,7 @@ options+=("Minimal" "/home #") options+=("User" "user:/home #") options+=("User and Hostname" "user@hostname:/home #") -sel=$(whiptail --backtitle "$apptitle" --title "Bash PS Configuration :" --menu "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Bash PS Configuration :" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/boot/grub/menu b/config/boot/grub/menu index bc677a4..645a429 100644 --- a/config/boot/grub/menu +++ b/config/boot/grub/menu @@ -6,7 +6,7 @@ options+=("config" "/etc/default/grub") options+=("grub-mkconfig" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Grub Config Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Grub Config Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/boot/initcpio/menu b/config/boot/initcpio/menu index 6bb27c6..729bada 100644 --- a/config/boot/initcpio/menu +++ b/config/boot/initcpio/menu @@ -6,7 +6,7 @@ options+=("Config" "/etc/mkinitcpio.conf") options+=("mkinicpio" "") defaultitem="Config" -sel=$(whiptail --backtitle "$apptitle" --title "Initcpio Config Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Initcpio Config Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -22,7 +22,7 @@ case $sel in for itm in $configs; do options+=("${itm::-7}" "" on) done - sel=$(whiptail --backtitle "$apptitle" --title "Choose configs :" --checklist "" --cancel-button "Back" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Choose configs :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/boot/menu b/config/boot/menu index 724f7c6..c88baeb 100644 --- a/config/boot/menu +++ b/config/boot/menu @@ -17,7 +17,7 @@ if [ -f /boot/syslinux/syslinux.cfg ]; then fi defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Boot Configuration :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Boot Configuration :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/boot/refind/menu b/config/boot/refind/menu index 8584c82..e3f3288 100644 --- a/config/boot/refind/menu +++ b/config/boot/refind/menu @@ -14,7 +14,7 @@ else fi defaultitem="Config" -sel=$(whiptail --backtitle "$apptitle" --title "rEFInd Config Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "rEFInd Config Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/boot/syslinux/menu b/config/boot/syslinux/menu index cb94728..6e0acb3 100644 --- a/config/boot/syslinux/menu +++ b/config/boot/syslinux/menu @@ -5,7 +5,7 @@ options=() options+=("config" "/boot/syslinux/syslinux.cfg") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Syslinux Config Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Syslinux Config Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/boot/systemd/entries b/config/boot/systemd/entries index e5fe62e..00dcce3 100644 --- a/config/boot/systemd/entries +++ b/config/boot/systemd/entries @@ -10,7 +10,7 @@ options+=("Create entry" "") options+=("Delete entry" "") defaultitem="Edit entry" -sel=$(whiptail --backtitle "$apptitle" --title "Systemd Entries Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Systemd Entries Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -25,7 +25,7 @@ case $sel in for itm in $entries; do entrylist+=("${itm::-5}" "") done - sel=$(whiptail --backtitle "$apptitle" --title "Edit entry :" --menu "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Edit entry :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${entrylist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -33,7 +33,7 @@ case $sel in fi ;; 'Create entry') - entry=$(whiptail --backtitle "$apptitle" --title "Create entry" --inputbox "Enter the new entry name :" 0 0 3>&1 1>&2 2>&3) + entry=$(dialog --backtitle "$apptitle" --title "Create entry" --inputbox "Enter the new entry name :" 0 0 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then cp /usr/share/systemd/bootctl/arch.conf /boot/loader/entries/$entry.conf sed -i "s/Arch Linux/$entry/" /boot/loader/entries/$entry.conf @@ -46,7 +46,7 @@ case $sel in for itm in $entries; do entrylist+=("${itm::-5}" "") done - sel=$(whiptail --backtitle "$apptitle" --title "Delete entry :" --menu "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Delete entry :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${entrylist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -61,7 +61,7 @@ case $sel in for itm in $entries; do entrylist+=("${itm::-5}" "" on) done - sel=$(whiptail --backtitle "$apptitle" --title "Update ucode of :" --checklist "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Update ucode of :" --cancel-button "Cancel" --checklist "" 0 0 0 \ "${entrylist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then diff --git a/config/boot/systemd/menu b/config/boot/systemd/menu index 0c3f804..7eef125 100644 --- a/config/boot/systemd/menu +++ b/config/boot/systemd/menu @@ -14,7 +14,7 @@ else fi defaultitem="Config" -sel=$(whiptail --backtitle "$apptitle" --title "Systemd Config Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Systemd Config Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/firewall/menu b/config/firewall/menu index 22aafff..42410dd 100644 --- a/config/firewall/menu +++ b/config/firewall/menu @@ -11,7 +11,7 @@ options+=("Start At Boot" "systemctl enable iptables & systemctl enable ip6table options+=("Generate Default Rules" "/etc/iptables/iptables.rules & /etc/iptables/ip6tables.rules") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Firewall Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Firewall Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/menu b/config/menu index 1f7b7f2..1b07b85 100644 --- a/config/menu +++ b/config/menu @@ -12,7 +12,7 @@ fi options+=("Boot" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Config Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Config Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/systemd/menu b/config/systemd/menu index bff577f..86ba5a1 100644 --- a/config/systemd/menu +++ b/config/systemd/menu @@ -7,7 +7,7 @@ options+=("" "") options+=("timedatectl" "") defaultitem="Services" -sel=$(whiptail --backtitle "$apptitle" --title "Systemd Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Systemd Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/systemd/services/menu b/config/systemd/services/menu index cad936d..42bc58e 100644 --- a/config/systemd/services/menu +++ b/config/systemd/services/menu @@ -10,7 +10,7 @@ options+=("Disable" "systemctl disable") #options+=("Stop" "(Experimental)") defaultitem="Enable" -sel=$(whiptail --backtitle "$apptitle" --title "Systemd services Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Systemd services Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -27,7 +27,7 @@ case $sel in svclist+=("$itm" "" off) fi done - sel=$(whiptail --backtitle "$apptitle" --title "Enable services :" --checklist "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Enable services :" --cancel-button "Cancel" --checklist "" 0 0 0 \ "${svclist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -44,7 +44,7 @@ case $sel in svclist+=("$itm" "" off) fi done - sel=$(whiptail --backtitle "$apptitle" --title "Disable services :" --checklist "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Disable services :" --cancel-button "Cancel" --checklist "" 0 0 0 \ "${svclist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -61,7 +61,7 @@ case $sel in svclist+=("$itm" "" off) fi done - sel=$(whiptail --backtitle "$apptitle" --title "Restart services :" --checklist "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Restart services :" --cancel-button "Cancel" --checklist "" 0 0 0 \ "${svclist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -78,7 +78,7 @@ case $sel in svclist+=("$itm" "" off) fi done - sel=$(whiptail --backtitle "$apptitle" --title "Start services :" --checklist "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Start services :" --cancel-button "Cancel" --checklist "" 0 0 0 \ "${svclist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -95,7 +95,7 @@ case $sel in svclist+=("$itm" "" off) fi done - sel=$(whiptail --backtitle "$apptitle" --title "Stop services :" --checklist "" --cancel-button "Cancel" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "Stop services :" --cancel-button "Cancel" --checklist "" 0 0 0 \ "${svclist[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then diff --git a/config/systemd/timedatectl/menu b/config/systemd/timedatectl/menu index 1bdb20c..23353f7 100644 --- a/config/systemd/timedatectl/menu +++ b/config/systemd/timedatectl/menu @@ -11,7 +11,7 @@ fi options+=("Edit" "/etc/systemd/timesyncd.conf") defaultitem="timedatectl" -sel=$(whiptail --backtitle "$apptitle" --title "Systemd timedatectl Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Systemd timedatectl Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/xorg/keyboard b/config/xorg/keyboard index 499db2c..4a04c12 100644 --- a/config/xorg/keyboard +++ b/config/xorg/keyboard @@ -16,7 +16,7 @@ items=$(localectl list-x11-keymap-layouts) for item in $items; do options+=("$item" "") done -layout=$(whiptail --backtitle "$apptitle" --title "Select keyboard layout :" --menu "" --cancel-button "Cancel" 0 0 0 \ +layout=$(dialog --backtitle "$apptitle" --title "Select keyboard layout :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -31,7 +31,7 @@ items=$(localectl list-x11-keymap-models) for item in $items; do options+=("$item" "") done -model=$(whiptail --backtitle "$apptitle" --title "Select keyboard model :" --menu "" --cancel-button "Cancel" 0 0 0 \ +model=$(dialog --backtitle "$apptitle" --title "Select keyboard model :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -47,7 +47,7 @@ items=$(localectl list-x11-keymap-variants $layout) for item in $items; do options+=("$item" "") done -variant=$(whiptail --backtitle "$apptitle" --title "Select keyboard variant :" --menu "" --cancel-button "Cancel" 0 0 0 \ +variant=$(dialog --backtitle "$apptitle" --title "Select keyboard variant :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -64,7 +64,7 @@ items=$(localectl list-x11-keymap-options) for item in $items; do options+=("$item" "") done -option=$(whiptail --backtitle "$apptitle" --title "Select keyboard option :" --menu "" --cancel-button "Cancel" 0 0 0 \ +option=$(dialog --backtitle "$apptitle" --title "Select keyboard option :" --cancel-button "Cancel" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/config/xorg/menu b/config/xorg/menu index 3be0902..bb4887c 100644 --- a/config/xorg/menu +++ b/config/xorg/menu @@ -6,7 +6,7 @@ options+=("Generate /etc/X11/xorg.conf.d/00-keyboard.conf" "") options+=("Edit /etc/X11/xorg.conf.d/00-keyboard.conf" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "XOrg Configuration :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg Configuration :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/dev/dev b/install/apps/dev/dev index cb1a38c..3c500fc 100644 --- a/install/apps/dev/dev +++ b/install/apps/dev/dev @@ -9,7 +9,7 @@ options+=("code" "(VS Code)" off) options+=("kdevelop" "(QT)" off) options+=("gource" "Git code animation" off) -sel=$(whiptail --backtitle "$apptitle" --title "Dev applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Dev applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/graphic/graphic b/install/apps/graphic/graphic index 19094b5..53690fa 100644 --- a/install/apps/graphic/graphic +++ b/install/apps/graphic/graphic @@ -7,7 +7,7 @@ options+=("inkscape" "(GTK)" off) options+=("dia" "(GTK)" off) options+=("krita" "(QT)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Graphic applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Graphic applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -25,7 +25,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"gimp"') choosepkg "gimp-help-";; + "gimp") choosepkg "gimp-help-";; esac done diff --git a/install/apps/internet/mail b/install/apps/internet/mail index 5219179..e016e97 100644 --- a/install/apps/internet/mail +++ b/install/apps/internet/mail @@ -8,7 +8,7 @@ options+=("evolution-bogofilter" "" off) options+=("evolution-spamassassin" "" off) options+=("evolution-ews" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "E-Mails applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "E-Mails applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -25,7 +25,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"thunderbird"') choosepkg "thunderbird-i18n-";; + "thunderbird") choosepkg "thunderbird-i18n-";; esac done diff --git a/install/apps/internet/menu b/install/apps/internet/menu index 07fb4d5..c8c1ac5 100644 --- a/install/apps/internet/menu +++ b/install/apps/internet/menu @@ -8,7 +8,7 @@ options+=("E-Mail" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Internet Apps :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Internet Apps :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/internet/torrent b/install/apps/internet/torrent index 1d44e2f..c266e96 100644 --- a/install/apps/internet/torrent +++ b/install/apps/internet/torrent @@ -9,7 +9,7 @@ options+=("qbittorrent" "(QT)" off) options+=("deluge" "(PYTHON)" off) options+=("tixati" "(AUR) (GTK)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Torrent applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Torrent applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -18,7 +18,7 @@ fi for itm in $sel; do case $itm in - '"tixati"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "tixati") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/install/apps/internet/webbrowser b/install/apps/internet/webbrowser index 7d18dbf..e5cc645 100644 --- a/install/apps/internet/webbrowser +++ b/install/apps/internet/webbrowser @@ -15,7 +15,7 @@ options+=("falkon" "(QT)" off) options+=("vivaldi" "(GTK)" off) options+=("vivaldi-ffmpeg-codecs" "Non-free codecs" off) -sel=$(whiptail --backtitle "$apptitle" --title "Web Browser applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Web Browser applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -24,8 +24,8 @@ fi for itm in $sel; do case $itm in - '"firefox-i18n"' | \ - '"seamonkey-i18n"') pkg="$pkg";; + "firefox-i18n" | \ + "seamonkey-i18n") pkg="$pkg";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done @@ -34,8 +34,8 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"firefox-i18n"') choosepkg "firefox-i18n-";; - '"seamonkey-i18n"') chooseaurpkg "seamonkey-i18n-";; + "firefox-i18n") choosepkg "firefox-i18n-";; + "seamonkey-i18n") chooseaurpkg "seamonkey-i18n-";; esac done diff --git a/install/apps/menu b/install/apps/menu index a01588e..e405feb 100644 --- a/install/apps/menu +++ b/install/apps/menu @@ -14,7 +14,7 @@ options+=("PacMan GUI" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Apps Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Apps Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/multimedia/audioplayer b/install/apps/multimedia/audioplayer index 4fcfc5f..5c7e492 100644 --- a/install/apps/multimedia/audioplayer +++ b/install/apps/multimedia/audioplayer @@ -10,7 +10,7 @@ options+=("amarok" "(AUR) (QT) Audio Player" off) options+=("guayadeque" "(AUR) (GTK) Audio Player" off) options+=("gmusicbrowser" "(AUR) (GTK) Audio Player" off) -sel=$(whiptail --backtitle "$apptitle" --title "Audio Player applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Audio Player applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -19,9 +19,9 @@ fi for itm in $sel; do case $itm in - '"amarok"' | \ - '"guayadeque"' | \ - '"gmusicbrowser"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "amarok" | \ + "guayadeque" | \ + "gmusicbrowser") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/install/apps/multimedia/burnertools b/install/apps/multimedia/burnertools index d64883b..17dca44 100644 --- a/install/apps/multimedia/burnertools +++ b/install/apps/multimedia/burnertools @@ -8,7 +8,7 @@ options+=("xfburn" "(GTK)" off) options+=("brasero" "(GTK)" off) options+=("gnomebaker" "(AUR)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Burner applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Burner applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -17,8 +17,8 @@ fi for itm in $sel; do case $itm in - '"gnomebaker"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; - '"xorriso-tcltk"') pkg="$pkg libisoburn tk kjobwidgets";; + "gnomebaker") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "xorriso-tcltk") pkg="$pkg libisoburn tk kjobwidgets";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/install/apps/multimedia/gstreamer b/install/apps/multimedia/gstreamer index 1fbf516..46b1bbb 100644 --- a/install/apps/multimedia/gstreamer +++ b/install/apps/multimedia/gstreamer @@ -11,7 +11,7 @@ options+=("gst-libav" "" on) #options+=("gst-plugin-libde265" "(AUR)" off) #options+=("libde265" "(AUR)" off) -sel=$(whiptail --backtitle "$apptitle" --title "GStreamer :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "GStreamer :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/multimedia/menu b/install/apps/multimedia/menu index db6113c..1377ee8 100644 --- a/install/apps/multimedia/menu +++ b/install/apps/multimedia/menu @@ -10,7 +10,7 @@ options+=("Burner Tools" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Multimedia Apps :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Multimedia Apps :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/multimedia/videoplayer b/install/apps/multimedia/videoplayer index 3c6efa6..c3149b3 100644 --- a/install/apps/multimedia/videoplayer +++ b/install/apps/multimedia/videoplayer @@ -9,7 +9,7 @@ options+=("mpv" "(GTK) Recommended for smplayer" off) options+=("celluloid" "(GTK) Video player" off) #options+=("streamstudio-bin" "(AUR) Stream video Player" off) -sel=$(whiptail --backtitle "$apptitle" --title "Video Player applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Video Player applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -18,7 +18,7 @@ fi for itm in $sel; do case $itm in - '"streamstudio-bin"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "streamstudio-bin") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/install/apps/multimedia/videotools b/install/apps/multimedia/videotools index bd12f59..78e239a 100644 --- a/install/apps/multimedia/videotools +++ b/install/apps/multimedia/videotools @@ -5,7 +5,7 @@ options=() options+=("avidemux-qt" "(QT) Video Editor" off) options+=("simplescreenrecorder" "(QT) Screen Recorder" off) -sel=$(whiptail --backtitle "$apptitle" --title "Videos Tools applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Videos Tools applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/office/menu b/install/apps/office/menu index 64dd134..d602e36 100644 --- a/install/apps/office/menu +++ b/install/apps/office/menu @@ -8,7 +8,7 @@ options+=("Office Tools" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Office Apps :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Office Apps :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/office/office b/install/apps/office/office index ed22382..f777891 100644 --- a/install/apps/office/office +++ b/install/apps/office/office @@ -5,7 +5,7 @@ options=() options+=("libreoffice-fresh" "(JAVA)" off) options+=("libreoffice-still" "(JAVA)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Office Suites applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Office Suites applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -14,7 +14,7 @@ fi for itm in $sel; do case $itm in - '"calcoo"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "calcoo") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done @@ -23,8 +23,8 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"libreoffice-fresh"') choosepkg "libreoffice-fresh-";; - '"libreoffice-still"') choosepkg "libreoffice-still-";; + "libreoffice-fresh") choosepkg "libreoffice-fresh-";; + "libreoffice-still") choosepkg "libreoffice-still-";; esac done diff --git a/install/apps/office/office-language-aids b/install/apps/office/office-language-aids index 888cb61..fee5a4c 100644 --- a/install/apps/office/office-language-aids +++ b/install/apps/office/office-language-aids @@ -10,7 +10,7 @@ options+=("libreoffice-extension-languagetool" "(AUR)" off) options+=("libreoffice-extension-grammalecte-fr" "(AUR)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Office Language aids :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Office Language aids :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -19,12 +19,12 @@ fi for itm in $sel; do case $itm in - '"hunspell"' | \ - '"hyphen"' | \ - '"hunspell"' | \ - '"mythes"') ;; - '"libreoffice-extension-languagetool"' | \ - '"libreoffice-extension-grammalecte-fr"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "hunspell" | \ + "hyphen" | \ + "hunspell" | \ + "mythes") ;; + "libreoffice-extension-languagetool" | \ + "libreoffice-extension-grammalecte-fr") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done @@ -33,9 +33,9 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"hunspell"') choosepkg "hunspell-";; - '"hyphen"') choosepkg "hyphen-";; - '"mythes"') choosepkg "mythes-";; + "hunspell") choosepkg "hunspell-";; + "hyphen") choosepkg "hyphen-";; + "mythes") choosepkg "mythes-";; esac done diff --git a/install/apps/office/office-tools b/install/apps/office/office-tools index 3e2306e..c714708 100644 --- a/install/apps/office/office-tools +++ b/install/apps/office/office-tools @@ -5,7 +5,7 @@ options=() options+=("galculator" "" off) options+=("qalculate-gtk" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Office Tools applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Office Tools applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/pacmangui/pacmangui b/install/apps/pacmangui/pacmangui index dc428f4..fee0841 100644 --- a/install/apps/pacmangui/pacmangui +++ b/install/apps/pacmangui/pacmangui @@ -4,7 +4,7 @@ options=() options+=("octopi" "(AUR) (QT)" off) options+=("pamac-aur" "(AUR) (GTK)" off) -sel=$(whiptail --backtitle "$apptitle" --title "PacMan GUI applications :" --checklist "Recommended to choose one" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "PacMan GUI applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/system/system b/install/apps/system/system index 4abd78d..0d9bdcf 100644 --- a/install/apps/system/system +++ b/install/apps/system/system @@ -19,7 +19,7 @@ options+=("gdmap" "" off) options+=("k4dirstat" "(AUR)" off) options+=("conky" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "System applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/tmp/dev b/install/apps/tmp/dev index d6049fd..94a3763 100644 --- a/install/apps/tmp/dev +++ b/install/apps/tmp/dev @@ -5,7 +5,7 @@ options=() options+=("Geany" "" off) options+=("WebStorm" "(AUR)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Dev applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Dev applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/tmp/games b/install/apps/tmp/games index 54a1eda..4e992d8 100644 --- a/install/apps/tmp/games +++ b/install/apps/tmp/games @@ -5,7 +5,7 @@ options=() options+=("0AD" "" off) options+=("puzzles" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Game applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Game applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/apps/tmp/network b/install/apps/tmp/network index e14cb25..8604bb5 100644 --- a/install/apps/tmp/network +++ b/install/apps/tmp/network @@ -9,7 +9,7 @@ options+=("teamviewer" "(AUR)" off) #options+=("zenmap" "" off) options+=("jnetmap" "(AUR)" off) -sel=$(whiptail --backtitle "$apptitle" --title "Network applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Network applications :" --cancel-button "Back" --checklist "Choose what you want" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/console/compression-tools b/install/console/compression-tools index 728d285..f4b5579 100644 --- a/install/console/compression-tools +++ b/install/console/compression-tools @@ -8,7 +8,7 @@ options+=("unrar" "RAR files" on) options+=("p7zip" "File Archiver" on) options+=("lzop" "LZO Compressor" on) -sel=$(whiptail --backtitle "$apptitle" --title "Console Compression Tools :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Console Compression Tools :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/console/generic b/install/console/generic index a27f878..25a3f13 100644 --- a/install/console/generic +++ b/install/console/generic @@ -20,7 +20,7 @@ options+=("powertop" "power mon and management" off) options+=("gpm" "Console mouse support" off) options+=("liveroot" "(AUR) root overlay fs" off) -sel=$(whiptail --backtitle "$apptitle" --title "Console Generic packages :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Console Generic packages :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -29,7 +29,7 @@ fi for itm in $sel; do case $itm in - '"liveroot"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "liveroot") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done @@ -38,7 +38,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"gpm"') + "gpm") svcstart gpm svcenable gpm ;; diff --git a/install/console/menu b/install/console/menu index 3806fc0..a690ebb 100644 --- a/install/console/menu +++ b/install/console/menu @@ -9,7 +9,7 @@ options+=("Webbrowser" "") options+=("Recovery Tools" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/console/network-tools b/install/console/network-tools index 57aaba1..cc673b8 100644 --- a/install/console/network-tools +++ b/install/console/network-tools @@ -16,7 +16,7 @@ options+=("dsniff" "tools for network auditing and penetration" off) options+=("mitmproxy" "SSL-capable MITM HTTP proxy" off) options+=("sslstrip" "tool to hijack HTTPS in MITM attack" off) -sel=$(whiptail --backtitle "$apptitle" --title "Console Network Tools :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Console Network Tools :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -25,7 +25,7 @@ fi for itm in $sel; do case $itm in - '"netdiscover"') + "netdiscover") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')" ;; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; diff --git a/install/console/recovery-tools b/install/console/recovery-tools index 03994a9..1d35dd0 100644 --- a/install/console/recovery-tools +++ b/install/console/recovery-tools @@ -6,7 +6,7 @@ options+=("ddrescue" "HD recovery tool" off) options+=("dd_rescue" "HD recovery tool" off) options+=("partclone" "Copy used block on partition" off) -sel=$(whiptail --backtitle "$apptitle" --title "Console Recovery Tools :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Console Recovery Tools :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/console/webbrowser b/install/console/webbrowser index 85119b9..d8ade72 100644 --- a/install/console/webbrowser +++ b/install/console/webbrowser @@ -6,7 +6,7 @@ options+=("elinks" "" off) options+=("links" "" off) options+=("lynx" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Console Web Browser :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Console Web Browser :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/cinnamon/menu b/install/desktop/cinnamon/menu index 6a884d3..2dd9146 100644 --- a/install/desktop/cinnamon/menu +++ b/install/desktop/cinnamon/menu @@ -6,7 +6,7 @@ options+=("cinnamon" "") options+=("gnome-terminal" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Cinnamon Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Cinnamon Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/cinnamon/packages b/install/desktop/cinnamon/packages index c8e246a..083482d 100644 --- a/install/desktop/cinnamon/packages +++ b/install/desktop/cinnamon/packages @@ -9,7 +9,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/deepin/menu b/install/desktop/deepin/menu index 809e3c0..95a811c 100644 --- a/install/desktop/deepin/menu +++ b/install/desktop/deepin/menu @@ -6,7 +6,7 @@ options+=("deepin" "") options+=("deepin-extra" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Deepin Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Deepin Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/deepin/packages b/install/desktop/deepin/packages index f72fefe..390b2b6 100644 --- a/install/desktop/deepin/packages +++ b/install/desktop/deepin/packages @@ -9,7 +9,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/enlightenment/packages b/install/desktop/enlightenment/packages index 8188ce3..e89ac5f 100644 --- a/install/desktop/enlightenment/packages +++ b/install/desktop/enlightenment/packages @@ -8,7 +8,7 @@ options+=("enlightenment" "" on) options+=("connman" "" on) options+=("acpid" "" on) -sel=$(whiptail --backtitle "$apptitle" --title "Enlightenment Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Enlightenment Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/gnome/menu b/install/desktop/gnome/menu index 7e7656e..a5f5a32 100644 --- a/install/desktop/gnome/menu +++ b/install/desktop/gnome/menu @@ -6,7 +6,7 @@ options+=("gnome" "") options+=("gnome-extra" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Gnome Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Gnome Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/gnome/packages b/install/desktop/gnome/packages index df8c468..06bfc7c 100644 --- a/install/desktop/gnome/packages +++ b/install/desktop/gnome/packages @@ -9,7 +9,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/lxde-gtk3/packages b/install/desktop/lxde-gtk3/packages index 7d2ce5f..8f326e9 100644 --- a/install/desktop/lxde-gtk3/packages +++ b/install/desktop/lxde-gtk3/packages @@ -8,7 +8,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "LXDE-GTK3 Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "LXDE-GTK3 Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -24,7 +24,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"lxdm-gtk3"') svcenable lxdm;; + "lxdm-gtk3") svcenable lxdm;; esac done diff --git a/install/desktop/lxde/packages b/install/desktop/lxde/packages index c9aef41..7a1bfaa 100644 --- a/install/desktop/lxde/packages +++ b/install/desktop/lxde/packages @@ -8,7 +8,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "LXDE Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "LXDE Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -24,7 +24,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"lxdm"') svcenable lxdm;; + "lxdm") svcenable lxdm;; esac done diff --git a/install/desktop/lxqt/complements b/install/desktop/lxqt/complements index b9cbfd8..a10a583 100644 --- a/install/desktop/lxqt/complements +++ b/install/desktop/lxqt/complements @@ -9,7 +9,7 @@ options+=("obconf" "" on) options+=("lxqt-connman-applet-git" "(AUR) Applet for NM" off) -sel=$(whiptail --backtitle "$apptitle" --title "LXQt Complements :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "LXQt Complements :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -18,7 +18,7 @@ fi for itm in $sel; do case $itm in - '"lxqt-connman-applet-git"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "lxqt-connman-applet-git") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done @@ -27,7 +27,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"sddm"') svcenable sddm;; + "sddm") svcenable sddm;; esac done diff --git a/install/desktop/lxqt/menu b/install/desktop/lxqt/menu index bd92cb8..01b13bd 100644 --- a/install/desktop/lxqt/menu +++ b/install/desktop/lxqt/menu @@ -6,7 +6,7 @@ options+=("LXQt" "") options+=("Complements" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "LXQt Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "LXQt Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/lxqt/packages b/install/desktop/lxqt/packages index ba4080a..7b28b48 100644 --- a/install/desktop/lxqt/packages +++ b/install/desktop/lxqt/packages @@ -8,7 +8,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "LXQT Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "LXQT Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/mate/menu b/install/desktop/mate/menu index 7572df6..7db8923 100644 --- a/install/desktop/mate/menu +++ b/install/desktop/mate/menu @@ -6,7 +6,7 @@ options+=("mate" "") options+=("mate-extra" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Mate Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Mate Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/mate/packages b/install/desktop/mate/packages index f72fefe..390b2b6 100644 --- a/install/desktop/mate/packages +++ b/install/desktop/mate/packages @@ -9,7 +9,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/menu b/install/desktop/menu index 06728c5..09d7113 100644 --- a/install/desktop/menu +++ b/install/desktop/menu @@ -17,7 +17,7 @@ options+=("Deepin" "(Help Wanted)") #options+=("i3" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Install Desktop Menu :" --menu "First item is most maintained" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Install Desktop Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "First item is most maintained" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/openbox/packages b/install/desktop/openbox/packages index 3d28ee9..a156327 100644 --- a/install/desktop/openbox/packages +++ b/install/desktop/openbox/packages @@ -11,7 +11,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "Openbox Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Openbox Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/plasma5/complements b/install/desktop/plasma5/complements index 5eaf814..3772c75 100644 --- a/install/desktop/plasma5/complements +++ b/install/desktop/plasma5/complements @@ -7,7 +7,7 @@ options+=("kdeconnect" "" off) options+=("sshfs" "(For kdeconnect)" off) options+=("systemdgenie" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Plasma Complements :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Plasma Complements :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/plasma5/kdeapps/kdeapps b/install/desktop/plasma5/kdeapps/kdeapps index 0539986..e68cb8c 100644 --- a/install/desktop/plasma5/kdeapps/kdeapps +++ b/install/desktop/plasma5/kdeapps/kdeapps @@ -45,7 +45,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/plasma5/kdeapps/menu b/install/desktop/plasma5/kdeapps/menu index 87ca9c0..cb2f223 100644 --- a/install/desktop/plasma5/kdeapps/menu +++ b/install/desktop/plasma5/kdeapps/menu @@ -9,7 +9,7 @@ options+=("Categories Meta" "kde-meta-") options+=("Categories" "My favorite") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "KDE Apps Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "KDE Apps Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/plasma5/kdeapps/metapackages b/install/desktop/plasma5/kdeapps/metapackages index fc6006e..d8632f0 100644 --- a/install/desktop/plasma5/kdeapps/metapackages +++ b/install/desktop/plasma5/kdeapps/metapackages @@ -18,7 +18,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "KDE Apps Meta Packages :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "KDE Apps Meta Packages :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/plasma5/kdeapps/packagecategories b/install/desktop/plasma5/kdeapps/packagecategories index 581702b..4c96e15 100644 --- a/install/desktop/plasma5/kdeapps/packagecategories +++ b/install/desktop/plasma5/kdeapps/packagecategories @@ -28,7 +28,7 @@ for item in $items; do done defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "KDE Apps Categories :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "KDE Apps Categories :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/plasma5/kdeapps/packages b/install/desktop/plasma5/kdeapps/packages index 4dfa035..b5a9c7d 100644 --- a/install/desktop/plasma5/kdeapps/packages +++ b/install/desktop/plasma5/kdeapps/packages @@ -46,7 +46,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/plasma5/kdeplasma b/install/desktop/plasma5/kdeplasma index 699fd74..3805ec5 100644 --- a/install/desktop/plasma5/kdeplasma +++ b/install/desktop/plasma5/kdeplasma @@ -12,7 +12,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "KDE Plasma :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "KDE Plasma :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/desktop/plasma5/menu b/install/desktop/plasma5/menu index 7762c03..5eef3c1 100644 --- a/install/desktop/plasma5/menu +++ b/install/desktop/plasma5/menu @@ -7,7 +7,7 @@ options+=("KDE Applications" "") options+=("Complements" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Plasma5 Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Plasma5 Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/plasma5/plasma-packages b/install/desktop/plasma5/plasma-packages index a262fae..81a6cf1 100644 --- a/install/desktop/plasma5/plasma-packages +++ b/install/desktop/plasma5/plasma-packages @@ -12,7 +12,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -28,7 +28,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"sddm-kcm"') + "sddm-kcm") svcenable sddm ;; esac diff --git a/install/desktop/xfce4/complements b/install/desktop/xfce4/complements index 58ce066..e6df17b 100644 --- a/install/desktop/xfce4/complements +++ b/install/desktop/xfce4/complements @@ -8,7 +8,7 @@ options+=("gvfs-afc" "" on) options+=("udisks2" "" on) options+=("network-manager-applet" "" on) -sel=$(whiptail --backtitle "$apptitle" --title "XFCE4 Complements :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XFCE4 Complements :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -25,7 +25,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"lightdm-gtk-greeter"') svcenable lightdm;; + "lightdm-gtk-greeter") svcenable lightdm;; esac done diff --git a/install/desktop/xfce4/menu b/install/desktop/xfce4/menu index 6161b7e..aecfe3d 100644 --- a/install/desktop/xfce4/menu +++ b/install/desktop/xfce4/menu @@ -7,7 +7,7 @@ options+=("xfce4-goodies" "") options+=("Complements" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "XFCE4 Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XFCE4 Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/desktop/xfce4/packages b/install/desktop/xfce4/packages index f72fefe..390b2b6 100644 --- a/install/desktop/xfce4/packages +++ b/install/desktop/xfce4/packages @@ -9,7 +9,7 @@ for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "$package Install :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/displaymngr/menu b/install/displaymngr/menu index 547746a..e440a0b 100644 --- a/install/displaymngr/menu +++ b/install/displaymngr/menu @@ -9,7 +9,7 @@ options+=("lightdm-gtk-greeter" "Other Login") #options+=("lightdm-kde-greeter" "Other Login") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Install Display Manager Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Install Display Manager Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/menu b/install/menu index 128d80e..5635515 100644 --- a/install/menu +++ b/install/menu @@ -10,7 +10,7 @@ options+=("Display Manager" "") options+=("Applications" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/filesystem b/install/system/filesystem index 1db9d8c..f03296c 100644 --- a/install/system/filesystem +++ b/install/system/filesystem @@ -28,7 +28,7 @@ options+=("s3fs-fuse" "" off) #options+=("f2fs-tools" "" off) # Normally installed by dependencies #options+=("favfs2" "" off) # Normally installed by dependencies -sel=$(whiptail --backtitle "$apptitle" --title "File System Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "File System Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -38,7 +38,7 @@ fi for itm in $sel; do case $itm in - '"hfsprogs"') + "hfsprogs") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')" ;; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; diff --git a/install/system/kernel/linux b/install/system/kernel/linux index c68c126..5f395fe 100644 --- a/install/system/kernel/linux +++ b/install/system/kernel/linux @@ -6,7 +6,7 @@ options+=("linux" "" on) options+=("linux-headers" "" on) options+=("linux-docs" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Kernel Linux Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Kernel Linux Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/kernel/linux-hardened b/install/system/kernel/linux-hardened index b33016a..fccc696 100644 --- a/install/system/kernel/linux-hardened +++ b/install/system/kernel/linux-hardened @@ -6,7 +6,7 @@ options+=("linux-hardened" "" on) options+=("linux-hardened-headers" "" on) options+=("linux-hardened-docs" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Kernel Linux Hardened Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Kernel Linux Hardened Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/kernel/linux-lts b/install/system/kernel/linux-lts index 194beb0..da6ca8c 100644 --- a/install/system/kernel/linux-lts +++ b/install/system/kernel/linux-lts @@ -6,7 +6,7 @@ options+=("linux-lts" "" on) options+=("linux-lts-headers" "" on) options+=("linux-lts-docs" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Kernel Linux LTS Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Kernel Linux LTS Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/kernel/linux-zen b/install/system/kernel/linux-zen index ad96bee..cb698c3 100644 --- a/install/system/kernel/linux-zen +++ b/install/system/kernel/linux-zen @@ -6,7 +6,7 @@ options+=("linux-zen" "" on) options+=("linux-zen-headers" "" on) options+=("linux-zen-docs" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "Kernel Linux ZEN Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Kernel Linux ZEN Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/kernel/menu b/install/system/kernel/menu index ee0a1cf..769844c 100644 --- a/install/system/kernel/menu +++ b/install/system/kernel/menu @@ -8,7 +8,7 @@ options+=("linux-zen" "") options+=("linux-hardened" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Kernel Install :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Kernel Install :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/menu b/install/system/menu index 6e4bdf9..bee5d7d 100644 --- a/install/system/menu +++ b/install/system/menu @@ -9,7 +9,7 @@ options+=("Sound" "") options+=("Print" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "System Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System Install Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/print b/install/system/print index 6357a6e..e206910 100644 --- a/install/system/print +++ b/install/system/print @@ -15,7 +15,7 @@ options+=("foomatic-db-gutenprint-ppds" "" off) options+=("foomatic-db-nonfree-ppds" "" off) #options+=("system-config-printer" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "System Print Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System Print Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -30,8 +30,8 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"cups"') svcenable cups.service cups;; - '"cups-pdf"') + "cups") svcenable cups.service cups;; + "cups-pdf") #if (confirm "Add a PDF Printer ?") then #fi diff --git a/install/system/services/menu b/install/system/services/menu index 00f738a..13a0228 100644 --- a/install/system/services/menu +++ b/install/system/services/menu @@ -33,7 +33,7 @@ options+=("ntp" "" off) #options+=("rsyslog" "" off) #options+=("systemd-readahead" "(AUR) boot improvement" off) -sel=$(whiptail --backtitle "$apptitle" --title "Services Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Services Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -42,8 +42,8 @@ fi for itm in $sel; do case $itm in - '"numlockon"') ;; - '"systemd-readahead"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "numlockon") ;; + "systemd-readahead") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done @@ -53,36 +53,36 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"networkmanager"') + "networkmanager") systemctl disable dhcpcd if (svcenable NetworkManager) then svcdisable dhcpcd fi ;; - '"openssh"') + "openssh") svcenable sshd "SSH Server" ;; - '"cronie"') + "cronie") svcenable cronie ;; - '"bluez"') + "bluez") svcenable bluetooth "Bluetooth Service" ;; - '"ntp"') + "ntp") svcenable ntpd "NTP Server" ;; - '"numlockon"') script install/system/services/numlockon;; - '"haveged"') + "numlockon") script install/system/services/numlockon;; + "haveged") svcenable haveged "Haveged" ;; - '"syslog-ng"') + "syslog-ng") #echo "ForwardToSyslog=yes" >> /etc/systemd/journald.conf systemctl enable syslog-ng@default ;; - '"rsyslog"') + "rsyslog") systemctl enable rsyslog ;; - '"net-snmp"') + "net-snmp") if (confirm "Create and edit /etc/snmp/snmpd.conf ?") then mkdir /etc/snmp > /dev/null echo "# SNMP Server Config" > /etc/snmp/snmpd.conf @@ -105,7 +105,7 @@ for itm in $sel; do fi svcenable snmpd "SNMP Server" ;; - '"systemd-readahead"') + "systemd-readahead") svcenable systemd-readahead ;; esac diff --git a/install/system/sound/menu b/install/system/sound/menu index 236ed81..862cdb5 100644 --- a/install/system/sound/menu +++ b/install/system/sound/menu @@ -7,7 +7,7 @@ options+=("pulseaudio" "(legacy)") options+=("pipewire-media-session" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "System Sound Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System Sound Menu :" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/sound/pipewire-media-session b/install/system/sound/pipewire-media-session index 05c361a..f7200fb 100644 --- a/install/system/sound/pipewire-media-session +++ b/install/system/sound/pipewire-media-session @@ -12,7 +12,7 @@ options+=("gst-plugin-pipewire" "" on) options+=("easyeffects" "" off) options+=("pipewire-x11-bell" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "System PPMediaSession Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System PPMediaSession Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/sound/pulseaudio b/install/system/sound/pulseaudio index e609406..24b725b 100644 --- a/install/system/sound/pulseaudio +++ b/install/system/sound/pulseaudio @@ -14,7 +14,7 @@ else fi options+=("pulseaudio-equalizer" "Equalizer for PulseAudio" off) -sel=$(whiptail --backtitle "$apptitle" --title "System Sound Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System Sound Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/system/sound/wireplumper b/install/system/sound/wireplumper index 0e41d93..e27ab84 100644 --- a/install/system/sound/wireplumper +++ b/install/system/sound/wireplumper @@ -12,7 +12,7 @@ options+=("gst-plugin-pipewire" "" on) options+=("easyeffects" "" off) options+=("pipewire-x11-bell" "" off) -sel=$(whiptail --backtitle "$apptitle" --title "System Wireplumper Install" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "System Wireplumper Install" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/xorg/complements/complements b/install/xorg/complements/complements index ab4a429..80cc193 100644 --- a/install/xorg/complements/complements +++ b/install/xorg/complements/complements @@ -4,7 +4,7 @@ options=() #options+=("numlockx" "" on) -sel=$(whiptail --backtitle "$apptitle" --title "XOrg Complements :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg Complements :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -21,7 +21,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - '"numlockx"') + "numlockx") if ( confirm "Add numlockx on to /usr/share/config/kdm/Xsetup ?" ) then echo "numlockx on" >> /usr/share/config/kdm/Xsetup fi diff --git a/install/xorg/fonts/default b/install/xorg/fonts/default index 095bd28..a3605cb 100644 --- a/install/xorg/fonts/default +++ b/install/xorg/fonts/default @@ -9,7 +9,7 @@ options+=("ttf-dejavu" "" on) options+=("ttf-liberation" "" on) options+=("xorg-fonts-type1" "" on) -sel=$(whiptail --backtitle "$apptitle" --title "XOrg Default Fonts :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg Default Fonts :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) diff --git a/install/xorg/fonts/menu b/install/xorg/fonts/menu index 717a7eb..942189c 100644 --- a/install/xorg/fonts/menu +++ b/install/xorg/fonts/menu @@ -6,7 +6,7 @@ options+=("Default" "") options+=("TTF" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "XOrg Fonts Install Menu" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg Fonts Install Menu" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/xorg/fonts/ttf b/install/xorg/fonts/ttf index 16c6288..47269aa 100644 --- a/install/xorg/fonts/ttf +++ b/install/xorg/fonts/ttf @@ -9,7 +9,7 @@ for item in $items; do options+=("$item" "" off) done -sel=$(whiptail --backtitle "$apptitle" --title "XOrg TTF :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg TTF :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -19,7 +19,7 @@ fi for itm in $sel; do case $itm in - '"ttf-ms-fonts"') aurpkg="$aurpkg ttf-ms-fonts";; + "ttf-ms-fonts") aurpkg="$aurpkg ttf-ms-fonts";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/install/xorg/input-drivers/input-drivers b/install/xorg/input-drivers/input-drivers index 2c6566c..71008f2 100644 --- a/install/xorg/input-drivers/input-drivers +++ b/install/xorg/input-drivers/input-drivers @@ -21,7 +21,7 @@ options+=("Madcatz-R.A.T.9" "(Not tested)" off) options+=("Madcatz-R.A.T.TE" "(Not tested)" off) -sel=$(whiptail --backtitle "$apptitle" --title "XOrg input drivers :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg input drivers :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -31,12 +31,12 @@ fi for itm in $sel; do case $itm in - '"Saitek-R.A.T.3"') script install/xorg/input-drivers/saitekrat3;; - '"Madcatz-R.A.T.3"') script install/xorg/input-drivers/madcatzrat3;; - '"Madcatz-R.A.T.5"') script install/xorg/input-drivers/madcatzrat5;; - '"Madcatz-R.A.T.7"') script install/xorg/input-drivers/madcatzrat7;; - '"Madcatz-R.A.T.9"') script install/xorg/input-drivers/madcatzrat9;; - '"Madcatz-R.A.T.TE"') script install/xorg/input-drivers/madcatzratte;; + "Saitek-R.A.T.3") script install/xorg/input-drivers/saitekrat3;; + "Madcatz-R.A.T.3") script install/xorg/input-drivers/madcatzrat3;; + "Madcatz-R.A.T.5") script install/xorg/input-drivers/madcatzrat5;; + "Madcatz-R.A.T.7") script install/xorg/input-drivers/madcatzrat7;; + "Madcatz-R.A.T.9") script install/xorg/input-drivers/madcatzrat9;; + "Madcatz-R.A.T.TE") script install/xorg/input-drivers/madcatzratte;; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/install/xorg/install b/install/xorg/install index 3d74f6a..b477811 100644 --- a/install/xorg/install +++ b/install/xorg/install @@ -18,7 +18,7 @@ for item in $items; do esac done -sel=$(whiptail --backtitle "$apptitle" --title "XOrg packages :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg packages :" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/xorg/menu b/install/xorg/menu index ccfe0ba..7d96718 100644 --- a/install/xorg/menu +++ b/install/xorg/menu @@ -10,7 +10,7 @@ options+=("Video Drivers" "") #options+=("Complements" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "XOrg Install Menu" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg Install Menu" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -21,7 +21,7 @@ sed -i "/^defaultitem=/c\defaultitem=\"$sel\"" $0 case $sel in 'GPU Infos') gpus=$(lspci | grep -e VGA -e 3D) - whiptail --backtitle "$apptitle" --title "Detected video card" --msgbox "$gpus" 0 0 + dialog --backtitle "$apptitle" --title "Detected video card" --msgbox "$gpus" 0 0 ;; 'Install') script install/xorg/install;; 'Fonts') menu install/xorg/fonts/menu;; diff --git a/install/xorg/video-drivers/menu b/install/xorg/video-drivers/menu index 1ee3064..da2c368 100644 --- a/install/xorg/video-drivers/menu +++ b/install/xorg/video-drivers/menu @@ -6,7 +6,7 @@ options+=("Open Source" "") options+=("Proprietary" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "XOrg Install Menu" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg Install Menu" --default-item "$defaultitem" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/xorg/video-drivers/open-source b/install/xorg/video-drivers/open-source index de1e59d..389a29a 100644 --- a/install/xorg/video-drivers/open-source +++ b/install/xorg/video-drivers/open-source @@ -7,7 +7,7 @@ for item in $items; do options+=("$item" "" off) done -sel=$(whiptail --backtitle "$apptitle" --title "XOrg video drivers :" --checklist "Choose video drivers for your system :" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg video drivers :" --cancel-button "Back" --checklist "Choose video drivers for your system :" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/install/xorg/video-drivers/proprietary b/install/xorg/video-drivers/proprietary index 5633d49..2f0de06 100644 --- a/install/xorg/video-drivers/proprietary +++ b/install/xorg/video-drivers/proprietary @@ -12,7 +12,7 @@ options+=("nvidia-390xx-dkms" "(AUR) (For custom kernel)" off) #options+=("catalyst" "(AUR)" off) #options+=("catalyst-total-hd234k" "(AUR)" off) -sel=$(whiptail --backtitle "$apptitle" --title "XOrg video drivers :" --checklist "Choose video drivers for your system :" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "XOrg video drivers :" --cancel-button "Back" --checklist "Choose video drivers for your system :" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -21,8 +21,8 @@ fi for itm in $sel; do case $itm in - '"nvidia-390xx"' | \ - '"nvidia-390xx-dkms"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; + "nvidia-390xx" | \ + "nvidia-390xx-dkms") aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";; *) pkg="$pkg $(echo $itm | sed 's/"//g')";; esac done diff --git a/lib b/lib index 7b42914..6a072ca 100644 --- a/lib +++ b/lib @@ -93,7 +93,7 @@ choosepkg(){ for item in $items; do options+=("$item" "" off) done - sel=$(whiptail --backtitle "$apptitle" --title "$title" --checklist "" --cancel-button "Back" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "$title" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -134,7 +134,7 @@ chooseaurpkg(){ for item in $items; do options+=("$item" "" off) done - sel=$(whiptail --backtitle "$apptitle" --title "$title" --checklist "" --cancel-button "Back" 0 0 0 \ + sel=$(dialog --backtitle "$apptitle" --title "$title" --cancel-button "Back" --checklist "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -165,7 +165,7 @@ require(){ # $1 : message # $2 : args confirm(){ - whiptail --backtitle "$apptitle" --yesno "$1" $2 0 0 + dialog --backtitle "$apptitle" $2 --yesno "$1" 0 0 } diff --git a/menu b/menu index e95a7a3..727cc24 100644 --- a/menu +++ b/menu @@ -8,7 +8,7 @@ options+=("Config" "") options+=("Shutdown" "") defaultitem="" -sel=$(whiptail --backtitle "$apptitle" --title "Main Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Exit" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Main Menu :" --default-item "$defaultitem" --cancel-button "Exit" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/shutdown/menu b/shutdown/menu index 25a22cd..a6cb09c 100644 --- a/shutdown/menu +++ b/shutdown/menu @@ -5,7 +5,7 @@ options=() options+=("Reboot" "") options+=("Shutdown" "") -sel=$(whiptail --backtitle "$apptitle" --title "Shutdown Menu :" --menu "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Shutdown Menu :" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then diff --git a/updates/menu b/updates/menu index 85dab03..b8741ad 100644 --- a/updates/menu +++ b/updates/menu @@ -57,7 +57,7 @@ if [ ! -f /usr/bin/pacdiff ]; then options+=("Install pacman-contrib" "") fi -sel=$(whiptail --backtitle "$apptitle" --title "Updates Menu :" --menu "" --cancel-button "Back" 0 0 0 \ +sel=$(dialog --backtitle "$apptitle" --title "Updates Menu :" --cancel-button "Back" --menu "" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ ! "$?" = "0" ]; then @@ -126,13 +126,13 @@ case $sel in gpgservers=() gpgservers+=("pool.sks-keyservers.net" "") gpgservers+=("Other" "") - sel=$(whiptail --backtitle "$apptitle" --title "Add GPG key" --menu "GPG key server" 0 0 0 "${gpgservers[@]}" 3>&1 1>&2 2>&3) + sel=$(dialog --backtitle "$apptitle" --title "Add GPG key" --menu "GPG key server" 0 0 0 "${gpgservers[@]}" 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then case $sel in "Other") - gpgserver=$(whiptail --backtitle "$apptitle" --title "Add GPG key" --inputbox "Enter the GPG key server :" 0 0 "" 3>&1 1>&2 2>&3) + gpgserver=$(dialog --backtitle "$apptitle" --title "Add GPG key" --inputbox "Enter the GPG key server :" 0 0 "" 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then - gpgkey=$(whiptail --backtitle "$apptitle" --title "Add GPG key" --inputbox "Enter the GPG key :" 0 0 3>&1 1>&2 2>&3) + gpgkey=$(dialog --backtitle "$apptitle" --title "Add GPG key" --inputbox "Enter the GPG key :" 0 0 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then echo "sudo -u aurbuilder gpg --keyserver "$gpgserver" --recv-keys "$gpgkey sudo -u aurbuilder gpg --keyserver $gpgserver --recv-keys $gpgkey @@ -142,7 +142,7 @@ case $sel in ;; *) gpgserver=$sel - gpgkey=$(whiptail --backtitle "$apptitle" --title "Add GPG key" --inputbox "Enter the GPG key :" 0 0 3>&1 1>&2 2>&3) + gpgkey=$(dialog --backtitle "$apptitle" --title "Add GPG key" --inputbox "Enter the GPG key :" 0 0 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then echo "sudo -u aurbuilder gpg --keyserver "$gpgserver" --recv-keys "$gpgkey sudo -u aurbuilder gpg --keyserver $gpgserver --recv-keys $gpgkey