Testing update to Veracrypt file

This commit is contained in:
tb14
2020-11-07 22:46:49 -08:00
parent a6b9102ede
commit bc2e871ff4
+16 -16
View File
@@ -1,7 +1,7 @@
#!/bin/bash
################################################################################
################################################################################
######################## AmRRON Setup Script v0.6.4 ########################
######################## AmRRON Setup Script v0.6.5 ########################
######################## Created by TB-14 ########################
######################## 07 NOV 20 ########################
################################################################################
@@ -1189,7 +1189,7 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then
echo "Installing / Updating CHIRP to version ${NEWCHIRP}"
sleep 2
if [[ ${CHIRP} == "NOT INSTALLED" ]]; then
sudo apt-get install -y python-gtk2 python-serial python-libxml2 ||
sudo apt-get install -y python-gtk2 python-serial python-libxml2 python-future ||
{ ERRCODE="Failed to get dependencies for CHIRP"; errors; return; }
fi
cd $USERDIR && wget -N https://trac.chirp.danplanet.com/\
@@ -2423,7 +2423,7 @@ NEWVC_lower=$(echo $NEWVC | tr '[:upper:]' '[:lower:]')
if [[ ${PLAT} = "Raspbian" ]]; then
VCLINK=$"http://sourceforge.net/projects/veracrypt/files/Contributions/ARM%20Linux/veracrypt-1.0f-1-setup-arm.tar.bz2"
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC_lower}-Debian-10-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"
@@ -2441,11 +2441,11 @@ NEWVC_lower=$(echo $NEWVC | tr '[:upper:]' '[:lower:]')
fi
if [[ ${PLAT} = "Raspbian" ]]; then
VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $9}')
else
#if [[ ${PLAT} = "Raspbian" ]]; then
# VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $9}')
# else
VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}')
fi
#fi
VCFILE_name=$(echo ${VCFILE} | awk -F '.tar.bz2' '{print $1}')
@@ -2453,24 +2453,24 @@ fi
cd $SECDIR && wget -N ${VCLINK} ||
{ ERRCODE="Failed to download Veracrypt"; errors; return; }
if [[ ${PLAT} = "Raspbian" ]]; then
# if [[ ${PLAT} = "Raspbian" ]]; then
tar xvf ${VCFILE} && rm ${VCFILE} ||
{ ERRCODE="Failed to extract Veracrypt"; errors; return; }
# 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; }
# rm *-console-arm ||
# { ERRCODE="Failed to remove extra CLI setup files for Veracrypt"; errors; return; }
echo vc >> /tmp/cleanup
# echo vc >> /tmp/cleanup
else
# else
sudo apt-get install -y libwxgtk3.0-gtk3-0v5 ||
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
# fi
}