diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh
index af0ffda..211643d 100755
--- a/AmRRON-Setup-Script.sh
+++ b/AmRRON-Setup-Script.sh
@@ -407,15 +407,15 @@ fi
echo "90% Complete"
-NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/
Latest\ Stable\ Release:\ //p' | awk -F '(' '{print $1}' | sed 's/.$//')
+NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/Latest\ Stable\ Release\ //p' | awk -F '(' '{print $1}' | sed 's/-\ //')
if [[ $NEWVC == "" ]]; then
NEWVC="SERVER DOWN"
fi
if [[ ${PLAT} = "Raspbian" ]]; then
-NEWARDOP=$(curl -s http://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="piardopc"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
+NEWARDOP=$(curl -s https://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="piardopc"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
else
-NEWARDOP=$(curl -s http://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="ardopc"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
+NEWARDOP=$(curl -s https://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="ardopc"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
fi
if [[ $NEWARDOP == "" ]]; then
@@ -423,9 +423,9 @@ if [[ $NEWARDOP == "" ]]; then
fi
if [[ ${PLAT} = "Raspbian" ]]; then
-NEWARDOPGUI=$(curl -s http://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="piARDOP_GUI"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
+NEWARDOPGUI=$(curl -s https://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="piARDOP_GUI"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
else
-NEWARDOPGUI=$(curl -s http://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="ARDOP_GUI"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
+NEWARDOPGUI=$(curl -s https://www.cantab.net/users/john.wiseman/Downloads/Beta/ | grep 'href="ARDOP_GUI"' | grep -o 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])
fi
if [[ $NEWARDOP == "" ]]; then
@@ -773,7 +773,7 @@ function ardop_install() {
echo "Copying archived working $ARDOP version from "$DIR"/Files/piardopc."
#wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\
#wiseman/Downloads/Beta/$ARDOP && chmod +x $ARDOPDIR/$ARDOP ||
- cp $DIR/Files/piardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP ||
+ mkdir -p $ARDOPDIR && cp $DIR/Files/piardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP ||
{ ERRCODE="Failed to download ardop"; errors; return; }
@@ -1351,7 +1351,7 @@ if [[ ${PLAT} = "Raspbian" ]]; then
-sudo apt-get -y install libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediawidgets5 libqt5serialport5 ||
+sudo apt-get -y install libgfortran5 libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediawidgets5 libqt5serialport5 ||
{ ERRCODE="Failed to get dependencies for JS8Call"; errors; return; }
#removed libqgsttools-p1 from dependencies
@@ -2484,66 +2484,48 @@ chmod +x /tmp/pfe && sudo mv /tmp/pfe /usr/local/bin/pfe ||
fi
}
+
function veracrypt_install() {
if [[ $NEWVC == "SERVER DOWN" ]]; then
- echo "Veracrypt server unresponsive or broken link." >> /tmp/failures
- return
+ echo "Veracrypt server unresponsive or broken link." >> /tmp/failures
+ return
fi
-NEWVC_lower=$(echo $NEWVC | tr '[:upper:]' '[:lower:]')
- if [[ ${PLAT} = "Raspbian" ]]; then
+ if [[ ${OSCN} = "buster" ]]; then
- VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC}-Debian-10-armhf.deb"
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-armhf.deb"
+ elif [[ $OSCN = "bullseye" ]]; then
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-armhf.deb"
+
elif [[ $OSCN =~ (eoan|focal|amber|ulyana) ]]; then
- VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC}-Ubuntu-19.10-amd64.deb"
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.10-amd64.deb"
elif [[ $OSCN =~ (disco) ]]; then
- VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC}-Ubuntu-19.04-amd64.deb"
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.04-amd64.deb"
elif [[ $OSCN =~ (bionic|cosmic|tara|tessa|tina|tricia) ]]; then
- VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC}-Ubuntu-18.04-amd64.deb"
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-18.04-amd64.deb"
elif [[ $OSCN =~ (xenial|yakkety|zesty|artful|sarah|serena|sonya|sylvia) ]]; then
- VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC}-Ubuntu-16.04-amd64.deb"
-
-
-
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-16.04-amd64.deb"
fi
-#if [[ ${PLAT} = "Raspbian" ]]; then
-# VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $9}')
-# else
VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}')
-#fi
-
- VCFILE_name=$(echo ${VCFILE} | awk -F '.tar.bz2' '{print $1}')
cd $SECDIR && wget -N ${VCLINK} ||
{ ERRCODE="Failed to download Veracrypt"; errors; return; }
-# if [[ ${PLAT} = "Raspbian" ]]; then
-
-# tar xvf ${VCFILE} && rm ${VCFILE} ||
-# { ERRCODE="Failed to extract Veracrypt"; errors; return; }
-
- # rm *-console-arm ||
-# { ERRCODE="Failed to remove extra CLI setup files for Veracrypt"; errors; return; }
-
- # echo vc >> /tmp/cleanup
-
-# else
-
- sudo apt-get install -y libwxgtk3.0-gtk3-0v5 libwxbase3.0-0v5 ||
- { ERRCODE="Failed to get dependencies for Veracrypt"; errors; return; }
-
- sudo dpkg -i ${VCFILE} ||
- { ERRCODE="Failed to install Veracrypt"; errors; return; }
- # fi
+ sudo apt-get install -y libwxgtk3.0-gtk3-0v5 libwxbase3.0-0v5 ||
+ { ERRCODE="Failed to get dependencies for Veracrypt"; errors; return; }
+ sudo apt-get install -y ${SECDIR}/${VCFILE} ||
+ { ERRCODE="Failed to install Veracrypt"; errors; return; }
}
+
+
function bitmessage_install() {
if hash pybitmessage 2>/dev/null; then
diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md
index 7d88a23..d1ce57e 100644
--- a/changelogs/CHANGELOG-Setup-Script.md
+++ b/changelogs/CHANGELOG-Setup-Script.md
@@ -1,4 +1,4 @@
-# Version 0.7.0
+# Version 0.7.0 - Working
- Working updates for current release 2022-09-22 Raspios Bullseye 32bit
- Changed gfortran3 dep to gfortran5 wsjtx
- Changed piardopc to pull from archived working version
@@ -7,6 +7,8 @@
- modified more deps, fixed error reporting issue.
- Changed Chirp Install to be from snap.
- Changed swap file check to only check if less than 3GB RAM.
+ - Fixed Veracrypt for Buster / Bullseye
+ - Fixed version checking errors for ARDOP / Veracrypt / ARDOP GUI
# Version 0.6.9
- Corrected wsjt-x address from http to https