diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index f693599..b344f7d 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -496,7 +496,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"') declare -A VER_MAP=(["11"]="bullseye" ["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \ ["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["19.10"]="eoan" ["20.04"]="focal" ["18"]="sara" ["18.1"]="serena" \ - ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ) + ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ) OSCN=${VER_MAP["${VER}"]} fi @@ -504,7 +504,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ case ${PLAT} in Ubuntu|Raspbian|Debian|LinuxMint|PureOS|Linuxmint) case ${OSCN} in - trusty|xenial|bionic|cosmic|disco|eoan|focal|jessie|stretch|buster|bullseye|sara|serena|sonya|sylvia|tara|tessa|tina|tricia|ulyana|amber) + trusty|xenial|bionic|cosmic|disco|eoan|focal|jessie|stretch|buster|bullseye|sara|serena|sonya|sylvia|tara|tessa|tina|tricia|ulyana|una|vanessa|amber) ;; *) maybeOS_Support @@ -762,7 +762,7 @@ fi -function ardop_install() { +function ardop_install_old() { ARDOPDIR=$USERDIR/ARDOP @@ -830,6 +830,67 @@ fi } +function ardop_install_old() { + + ARDOPDIR=$USERDIR/ARDOP + + if [[ ${PLAT} = "Raspbian" ]]; then + ARDOP=$"piardopc" + + if [[ -f $ARDOPDIR/$ARDOP ]]; then + echo "Making backup of current version" + mv $ARDOPDIR/$ARDOP $ARDOPDIR/${ARDOP}-$(date +%h%d).bak || + { ERRCODE="Failed to create backup of current ardop file"; errors; return; } + fi + + 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 || + mkdir -p $ARDOPDIR && cp $DIR/Files/piardopc $ARDOPDIR/$ARDOP && chmod +x $ARDOPDIR/$ARDOP || + { ERRCODE="Failed to download ardop"; errors; return; } + + + else + ARDOP=$"ardopc" + + + if [[ -f $ARDOPDIR/$ARDOP ]]; then + echo "Making backup of current version" + mv $ARDOPDIR/$ARDOP $ARDOPDIR/${ARDOP}-$(date +%h%d).bak || + { ERRCODE="Failed to create backup of current ardop file"; errors; return; } + else + mkdir -p $ARDOPDIR || + { ERRCODE="Failed to create ARDOPDIR"; errors; return; } + fi + + sudo apt-get -y install libasound2-dev || + { ERRCODE="Failed to get dependencies for ARDOPC"; errors; return; } + + echo "Downloading current $ARDOP version." + wget -P $ARDOPDIR -N http://www.cantab.net/users/john.wiseman/Downloads/Beta/ardopc || + { ERRCODE="Failed to download ARDOPC"; errors; return; } + fi + + if [[ ! -f $HOME/.asoundrc ]]; then + echo "pcm.ARDOP { + type rate + slave { + pcm "\""hw:1,0"\"" + rate 48000 + } + }" > $HOME/.asoundrc || + { ERRCODE="Failed to create .asoundrc configuration file"; errors; return; } + fi + echo ardop >> /tmp/cleanup + echo asoundrc >> /tmp/cleanup + + if ! hash ardop-status 2>/dev/null; then + ardop_launcher + fi + + + } + function ardop_gui_install() { @@ -862,7 +923,10 @@ else { ERRCODE="Failed to create backup of current ardop_gui file"; errors; return; } fi - sudo apt-get -y install g++ qt5-default || + #Debian 10 version + #sudo apt-get -y install g++ qt5-default || + #Debian 11 version + sudo apt-get install g++ qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools || { ERRCODE="Failed to get dependencies for ARDOP_GUI"; errors; return; } wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ @@ -1201,15 +1265,21 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then sleep 2 if [[ ${CHIRP} == "NOT INSTALLED" ]]; then #sudo apt-get install -y python-gtk2 python-serial python-libxml2 python-future || + if [[ ${PLAT} = "Linuxmint" ]]; then + if [[ -f /etc/apt/preferences.d/nosnap.pref ]]; then + mv /etc/apt/preferences.d/nosnap.pref /etc/apt/preferences.d/nosnap.pref.bak || + { ERRCODE="Failed to remove Linuxmint block from using snaps. Remove /etc/apt/preferences.d/nosnap.pref to enable snaps."; errors; return; } + fi + fi sudo apt-get install -y snapd || { ERRCODE="Failed to install Snap for Chirp installation"; errors; return; } # { ERRCODE="Failed to get dependencies for CHIRP"; errors; return; } - fi + sudo snap install chirp-snap --edge || { ERRCODE="Failed to install Chirp from snap store."; errors; return; } sudo snap connect chirp-snap:raw-usb || { ERRCODE="Failed to set USB permissions for Chirp-snap."; errors; return; } - + fi @@ -2370,7 +2440,11 @@ sudo snap install core && sudo snap install keepassxc || { ERRCODE="Failed to install snap / snap core requirements for KeepassXC"; errors; return; } else - +if [[ ${PLAT} = "Linuxmint" ]]; then + if [[ -f /etc/apt/preferences.d/nosnap.pref ]]; then + mv /etc/apt/preferences.d/nosnap.pref /etc/apt/preferences.d/nosnap.pref.bak || + { ERRCODE="Failed to remove Linuxmint block from using snaps. Remove /etc/apt/preferences.d/nosnap.pref to enable snaps."; errors; return; } + fi sudo apt-get install -y snapd && sudo snap install core && sudo snap install keepassxc || { ERRCODE="Failed to install snap / snap core requirements for KeepassXC"; errors; return; } @@ -2529,7 +2603,13 @@ fi 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 + elif [[ $OSCN =~ "vanessa" ]]; then + VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-amd64.deb" + + elif [[ $OSCN =~ (ulyana|ulyssa|uma|una) ]]; then + VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-10-amd64.deb" + + elif [[ $OSCN =~ (eoan|focal|amber) ]]; then VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-19.10-amd64.deb" elif [[ $OSCN =~ (disco) ]]; then diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index d8e6a2c..a90751c 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,10 @@ +# Version 0.7.1 + - Mint 21 tweaks + - ARDOPC file instead of from source + - remove snap restriction + - ARDOP GUI deps + - Fix Veracrypt links. + # Version 0.7.0 - Working - Working updates for current release 2022-09-22 Raspios Bullseye 32bit - Changed gfortran3 dep to gfortran5 wsjtx