mirror of
https://gitlab.com/amrron/setup-scripts.git
synced 2026-10-17 01:54:00 -04:00
Version checking fix
This commit is contained in:
+16
-5
@@ -278,6 +278,17 @@ else
|
||||
LIBREVER="NOT INSTALLED"
|
||||
fi
|
||||
|
||||
if hash vim 2>/dev/null; then
|
||||
VIMVER="INSTALLED"
|
||||
else
|
||||
VIMVER="NOT INSTALLED"
|
||||
fi
|
||||
|
||||
if hash filezilla 2>/dev/null; then
|
||||
FZVER="INSTALLED"
|
||||
else
|
||||
FZVER="NOT INSTALLED"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -2698,17 +2709,17 @@ rc=$?
|
||||
function other_installer(){
|
||||
yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator="" \
|
||||
--title "Select Other Programs" \
|
||||
--text "Select the other programs you would like to install" \
|
||||
--text "Select the other programs you would like to install. RASPAP not included in 'Install All'" \
|
||||
--list --wrap-width=150 --wrap-cols=3 \
|
||||
--button="gtk-close:1" --button="Install All:2" --button="Install Selected:0" \
|
||||
--column="Tick" --column="Category" --column="Description" --column="Installed" \
|
||||
false "GEDIT" "Graphical Text Editor." "${GEDITVER}" \
|
||||
false "VIM" "VIM text editor." "" \
|
||||
false "FILEZILLA" "Graphical FTP program" "" \
|
||||
false "VIM" "VIM text editor." "${VIMVER}" \
|
||||
false "FILEZILLA" "Graphical FTP program" "${FZVER}" \
|
||||
false "MATCHBOX_KEYBOARD" "Touchscreen keyboard" "${KEYBOARDVER}" \
|
||||
false "SCREEN" "Useful tool for terminal management." "${SCREENVER}" \
|
||||
false "SPEEDTEST" "Run internet speedtests from the command line." "${SPEEDTESTVER}" \
|
||||
false "ELECTRUM" "Electrum BTC Wallet. Not working on Pi yet." "" \
|
||||
false "ELECTRUM" "Electrum BTC Wallet." "" \
|
||||
false "RASPAP" "Turn your Pi 3 into an Access Point (Hotspot)." "" \
|
||||
false "CONKY" "Conky system monitor" "${CONKYVER}" \
|
||||
false "LIBREOFFICE" "LibreOffice Suite" "${LIBREVER}" \
|
||||
@@ -2716,7 +2727,7 @@ yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator=""
|
||||
rc=$?
|
||||
|
||||
if [[ $rc == 2 ]]; then
|
||||
otherArray=(GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST ELECTRUM RASPAP CONKY LIBREOFFICE)
|
||||
otherArray=(GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST ELECTRUM CONKY LIBREOFFICE)
|
||||
|
||||
for i in "${otherArray[@]}"
|
||||
do
|
||||
|
||||
Reference in New Issue
Block a user