From fd6d20ef401b3484c824ef1960b063b90d82d89c Mon Sep 17 00:00:00 2001 From: tb14 Date: Sat, 15 Oct 2022 22:19:52 -0500 Subject: [PATCH] more edits --- AmRRON-Setup-Script.sh | 12 ++++++------ changelogs/CHANGELOG-Setup-Script.md | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 2c190d0..e90d751 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.7.0 ######################## +######################## AmRRON Setup Script v0.7.1 ######################## ######################## Created by TB-14 ######################## -######################## 11 OCT 22 ######################## +######################## 15 OCT 22 ######################## ################################################################################ ################################################################################ # @@ -930,7 +930,7 @@ else #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 || + sudo apt-get -y 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.\ @@ -1264,7 +1264,7 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; 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 || + sudo 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 @@ -2094,7 +2094,7 @@ fi echo "Electrum is already at the Version $NEWELECTRUM" else - if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|cosmic|disco|eoan|focal|buster|amber|ulyana) ]]; then + if hash python3 2>/dev/null; then echo "Getting dependencies" sudo apt-get install -y python3-setuptools python3-pyqt5 python3-pip libsecp256k1-dev || { ERRCODE="Failed to get dependencies for Electrum"; errors; return; } @@ -2407,7 +2407,7 @@ 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 || + sudo 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 diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index a90751c..4bcc77b 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -4,6 +4,8 @@ - remove snap restriction - ARDOP GUI deps - Fix Veracrypt links. + - fixed missing sudo for snap block + - Fixed electrum check for python3 # Version 0.7.0 - Working - Working updates for current release 2022-09-22 Raspios Bullseye 32bit