more edits

This commit is contained in:
tb14
2022-10-15 22:19:52 -05:00
parent 0ee175cb6b
commit fd6d20ef40
2 changed files with 8 additions and 6 deletions
+6 -6
View File
@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
################################################################################ ################################################################################
################################################################################ ################################################################################
######################## AmRRON Setup Script v0.7.0 ######################## ######################## AmRRON Setup Script v0.7.1 ########################
######################## Created by TB-14 ######################## ######################## Created by TB-14 ########################
######################## 11 OCT 22 ######################## ######################## 15 OCT 22 ########################
################################################################################ ################################################################################
################################################################################ ################################################################################
# #
@@ -930,7 +930,7 @@ else
#Debian 10 version #Debian 10 version
#sudo apt-get -y install g++ qt5-default || #sudo apt-get -y install g++ qt5-default ||
#Debian 11 version #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; } { ERRCODE="Failed to get dependencies for ARDOP_GUI"; errors; return; }
wget -P $ARDOPDIR -N http://www.cantab.net/users/john.\ 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 || #sudo apt-get install -y python-gtk2 python-serial python-libxml2 python-future ||
if [[ ${PLAT} = "Linuxmint" ]]; then if [[ ${PLAT} = "Linuxmint" ]]; then
if [[ -f /etc/apt/preferences.d/nosnap.pref ]]; 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; } { ERRCODE="Failed to remove Linuxmint block from using snaps. Remove /etc/apt/preferences.d/nosnap.pref to enable snaps."; errors; return; }
fi fi
fi fi
@@ -2094,7 +2094,7 @@ fi
echo "Electrum is already at the Version $NEWELECTRUM" echo "Electrum is already at the Version $NEWELECTRUM"
else 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" echo "Getting dependencies"
sudo apt-get install -y python3-setuptools python3-pyqt5 python3-pip libsecp256k1-dev || sudo apt-get install -y python3-setuptools python3-pyqt5 python3-pip libsecp256k1-dev ||
{ ERRCODE="Failed to get dependencies for Electrum"; errors; return; } { ERRCODE="Failed to get dependencies for Electrum"; errors; return; }
@@ -2407,7 +2407,7 @@ else
if [[ ${PLAT} = "Linuxmint" ]]; then if [[ ${PLAT} = "Linuxmint" ]]; then
if [[ -f /etc/apt/preferences.d/nosnap.pref ]]; 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; } { ERRCODE="Failed to remove Linuxmint block from using snaps. Remove /etc/apt/preferences.d/nosnap.pref to enable snaps."; errors; return; }
fi fi
fi fi
+2
View File
@@ -4,6 +4,8 @@
- remove snap restriction - remove snap restriction
- ARDOP GUI deps - ARDOP GUI deps
- Fix Veracrypt links. - Fix Veracrypt links.
- fixed missing sudo for snap block
- Fixed electrum check for python3
# Version 0.7.0 - Working # Version 0.7.0 - Working
- Working updates for current release 2022-09-22 Raspios Bullseye 32bit - Working updates for current release 2022-09-22 Raspios Bullseye 32bit