From dd7031467d722f3d94c7c2aaecb5f562a4351b95 Mon Sep 17 00:00:00 2001 From: tb14 Date: Sun, 16 Oct 2022 11:38:12 -0500 Subject: [PATCH] VC version / Bitmessage checking --- AmRRON-Setup-Script.sh | 25 ++++++++++++++++++++++--- changelogs/CHANGELOG-Setup-Script.md | 2 ++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index fb94ccc..9cc998e 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -309,6 +309,12 @@ if hash gpa 2>/dev/null; then else GPAVER="NOT INSTALLED" fi + +if has veracrypt 2>/dev/null; then + VCVER=$(veracrypt --text --version | awk -F ' ' '{print $2}') +else + VCVER="NOT INSTALLED" + } @@ -2568,6 +2574,10 @@ if [[ $NEWVC == "SERVER DOWN" ]]; then return fi +if [[ $VCVER == $NEWVC ]]; then + echo "Veracrypt already installed at current version. No updates available." + else + if [[ ${OSCN} = "buster" ]]; then VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-armhf.deb" @@ -2594,6 +2604,7 @@ fi VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-16.04-amd64.deb" fi + VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}') @@ -2605,6 +2616,7 @@ VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}') sudo apt-get install -y ${SECDIR}/${VCFILE} || { ERRCODE="Failed to install Veracrypt"; errors; return; } +fi } @@ -2633,6 +2645,8 @@ echo pybitmessagesetup >> /tmp/cleanup function bitmessage_install() { +if apt-cache show python-qt4; then + if hash pybitmessage 2>/dev/null; then cd $SECDIR/PyBitmessage/src && git fetch --all && git reset --hard \ @@ -2651,6 +2665,11 @@ cd $SECDIR/PyBitmessage && sudo python setup.py install || fi echo pybitmessagesetup >> /tmp/cleanup + +else + { ERRCODE="Bitmessage relies upon no longer supported packages. You will need to downgrade to a Debian 10 based distro in order to run Bitmessage"; errors; return; } + +fi } @@ -3027,7 +3046,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "PFE" "Paranoia Tools File Encrypter. Encrypt/Decrypt files" "${PFEVER}" \ false "GTKHASH" "GTK based file hash tool" "${GTKHASHVER}" \ false "GPA" "GNU Privacy Assist Key Manager" "${GPAVER}" \ - false "VERACRYPT" "Disk/File Encryption. $NEWVC" "" \ + false "VERACRYPT" "Disk/File Encryption. $NEWVC" "$VCVER" \ false "BITMESSAGE" "Bitmessage secure decentralized email" "" \ false "HARDEN_SSH" "Change folder permissions and provide SSH tips document." "" \ false "WIFI-DISABLE" "Disable WiFi -- Raspberry Pi 3 ONLY" "" \ @@ -3519,8 +3538,8 @@ cat /tmp/results | yad --text-info --center \ PFE) echo "Installing Paranoia File Encrypter" pfe_install ;; - BITMESSAGE) echo "TEMP DISABLED-Installing Bitmessage" - #bitmessage_install + BITMESSAGE) echo "Installing Bitmessage" + bitmessage_install ;; VERACRYPT) echo "Installing Veracrypt" veracrypt_install diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 493132d..a0b70c1 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -7,6 +7,8 @@ - fixed missing sudo for snap block - Fixed electrum check for python3 - fixed gpsd deps check for Deb 10 / Deb 11 systems + - Bitmessage enabled and distro check + - Veracrypt version info in selection. # Version 0.7.0 - Working - Working updates for current release 2022-09-22 Raspios Bullseye 32bit