diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index c5e8060..b6fe1df 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -2652,31 +2652,59 @@ fi ###################### Other tools Functions ################################# ################################################################################ function vim_install() { + if dpkg -s vim &>/dev/null; then + echo "Already installed" +else sudo apt-get -y install vim +fi } function filezilla_install() { + if dpkg -s filezilla &>/dev/null; then + echo "Already installed" +else sudo apt-get -y install filezilla +fi } function gedit_install() { + if dpkg -s gedit &>/dev/null; then + echo "Already installed" +else sudo apt-get -y install gedit +fi } function libreoffice_install() { + if dpkg -s libreoffice &>/dev/null; then + echo "Already installed" +else sudo apt -y install libreoffice +fi } function keyboard_install() { + if dpkg -s matchbox-keyboard &>/dev/null; then + echo "Already installed" +else sudo apt-get -y install matchbox-keyboard +fi } function screen_install() { + if dpkg -s screen &>/dev/null; then + echo "Already installed" +else sudo apt-get -y install screen +fi } function speedtest_install() { + if dpkg -s speedtest-cli &>/dev/null; then + echo "Already installed" +else sudo apt-get -y install speedtest-cli +fi } function raspap_install() { @@ -3078,16 +3106,28 @@ function keepassxc_install() { } function gtkhash_install() { + if dpkg -s gtkhash &>/dev/null; then + echo "Already installed" +else sudo apt-get install -y gtkhash +fi } function gpa_install() { + if dpkg -s gpa &>/dev/null; then + echo "Already installed" +else sudo apt-get install -y gpa +fi } function kleopatra_install() { + if dpkg -s kleopatra &>/dev/null && dpkg -s scdaemon &>/dev/null; then + echo "Already installed" +else sudo apt-get install -y kleopatra scdaemon || { ERRCODE="Failed to install kleopatra"; errors; return; } +fi gpg --import $DIR/Files/pgp-keys/* || { ERRCODE="Failed to import AmRRON keys into keychain"; errors; return; } @@ -3104,8 +3144,6 @@ if [[ ! -f $HOME/.ssh/authorized_keys ]]; then chmod 600 $HOME/.ssh/authorized_keys || { ERRCODE="Failed to modify permission on $HOME/.ssh/authorized_keys"; errors; return; } - - fi