mirror of
https://gitlab.com/amrron/setup-scripts.git
synced 2026-10-17 01:54:00 -04:00
more 64bit tweaks
This commit is contained in:
+33
-66
@@ -1210,13 +1210,18 @@ if [[ $NEWPAT == "SERVER DOWN" ]]; then
|
||||
echo "PAT server unresponsive or broken link." >> /tmp/failures
|
||||
return
|
||||
fi
|
||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
||||
SYS=$"armhf"
|
||||
elif [[ $(uname -m) = x86_64 ]]; then
|
||||
SYS=$"amd64"
|
||||
else
|
||||
SYS=$"i386"
|
||||
fi
|
||||
if [[ $(uname -m) = aarch64 ]] && [[ $(getconf LONG_BIT) = '32' ]]; then
|
||||
SYS=$"armhf"
|
||||
|
||||
elif [[ $(uname -m) = aarch64 ]] && [[ $(getconf LONG_BIT) = '64' ]]; then
|
||||
SYS=$"arm64"
|
||||
|
||||
elif [[ $(uname -m) = x86_64 ]]; then
|
||||
SYS=$"amd64"
|
||||
|
||||
else
|
||||
SYS=$"i386"
|
||||
fi
|
||||
|
||||
|
||||
if [[ ${PAT} == ${NEWPAT} ]]; then
|
||||
@@ -1381,57 +1386,6 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then
|
||||
|
||||
}
|
||||
|
||||
function wsjtx_install_old() {
|
||||
|
||||
if [[ $NEWWSJTX == "SERVER DOWN" ]]; then
|
||||
echo "WSJTX server unresponsive or broken link." >> /tmp/failures
|
||||
return
|
||||
fi
|
||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
||||
SYS=$"armhf"
|
||||
elif [[ $(uname -m) = x86_64 ]]; then
|
||||
SYS=$"amd64"
|
||||
fi
|
||||
|
||||
#Install from binary
|
||||
|
||||
if [[ ${WSJTXVER} == ${NEWWSJTX} ]]; then
|
||||
echo "WSJTX is already at the most current version"
|
||||
|
||||
else
|
||||
|
||||
if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|eoan|focal|cosmic|stretch|buster|ulyana|amber) ]]; then
|
||||
|
||||
echo "Getting dependencies"
|
||||
#libboost-atomic1.62.0 libboost-chrono1.62.0 libboost-date-time1.62.0 libboost-filesystem1.62.0 libboost-log1.62.0 libboost-log1.67.0 libboost-regex1.62.0 libboost-system1.62.0 libboost-thread1.62.0
|
||||
sudo apt-get -y install libqt5multimedia5-plugins libqt5serialport5 libqt5printsupport5 \
|
||||
libqt5sql5-sqlite libfftw3-single3 libgfortran5 ||
|
||||
{ ERRCODE="Failed to get dependencies for WSJTX"; errors; return; }
|
||||
|
||||
|
||||
cd $USERDIR && wget -N https://physics.princeton.edu/pulsar/K1JT/wsjtx_${NEWWSJTX}_${SYS}.deb ||
|
||||
{ ERRCODE="Failed to download WSJTX"; errors; return; }
|
||||
|
||||
sudo dpkg -i wsjtx_${NEWWSJTX}_${SYS}.deb ||
|
||||
{ ERRCODE="Failed to install WSJTX"; errors; return; }
|
||||
|
||||
rm wsjtx_${NEWWSJTX}_${SYS}.deb ||
|
||||
{ ERRCODE="Failed to remove WSJTX deb file."; errors; return; }
|
||||
|
||||
|
||||
else
|
||||
|
||||
#install from source
|
||||
#sudo apt install -y qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libqt5multimedia5-plugins libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev portaudio19-dev cmake libgfortran5
|
||||
sudo apt install -y qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev portaudio19-dev cmake libgfortran5
|
||||
echo wsjtxunsupported >> /tmp/cleanup
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
|
||||
function wsjtx_install() {
|
||||
|
||||
if [[ $NEWWSJTXVER == "SERVER DOWN" ]]; then
|
||||
@@ -2664,30 +2618,43 @@ if [[ $VCVER == $NEWVC ]]; then
|
||||
echo "Veracrypt already installed at current version. No updates available."
|
||||
else
|
||||
|
||||
if [[ $(uname -m) = aarch64 ]] && [[ $(getconf LONG_BIT) = '32' ]]; then
|
||||
SYS=$"armhf"
|
||||
|
||||
elif [[ $(uname -m) = aarch64 ]] && [[ $(getconf LONG_BIT) = '64' ]]; then
|
||||
SYS=$"arm64"
|
||||
|
||||
elif [[ $(uname -m) = x86_64 ]]; then
|
||||
SYS=$"amd64"
|
||||
|
||||
else
|
||||
SYS=$"i386"
|
||||
fi
|
||||
|
||||
if [[ ${OSCN} = "buster" ]]; then
|
||||
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-armhf.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN = "bullseye" ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-armhf.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN =~ "vanessa" ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-amd64.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN =~ (ulyana|ulyssa|uma|una) ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-amd64.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN =~ (eoan|focal|amber) ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.10-amd64.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.10-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN =~ (disco) ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.04-amd64.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.04-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN =~ (bionic|cosmic|tara|tessa|tina|tricia) ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-18.04-amd64.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-18.04-${SYS}.deb"
|
||||
|
||||
elif [[ $OSCN =~ (xenial|yakkety|zesty|artful|sarah|serena|sonya|sylvia) ]]; then
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-16.04-amd64.deb"
|
||||
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-16.04-${SYS}.deb"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Version 0.7.2
|
||||
- FLDIGI raspbian 64bit check
|
||||
- Fix 64bit check for diff OS based upon apt avaibility.
|
||||
- Veracrypt 64bit check
|
||||
|
||||
# Version 0.7.1
|
||||
- Mint 21 tweaks
|
||||
|
||||
Reference in New Issue
Block a user