From 93d6d81b24316043ba928fc20715eaf7b16f3aae Mon Sep 17 00:00:00 2001 From: tb14 Date: Sun, 8 Nov 2020 00:57:14 -0800 Subject: [PATCH] v0.6.6, keepassxc install as snap, fixed electrum download link --- AmRRON-Setup-Script.sh | 69 ++++++++++++++-------------- changelogs/CHANGELOG-Setup-Script.md | 4 ++ 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 9e0842f..fd67676 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -3,7 +3,7 @@ ################################################################################ ######################## AmRRON Setup Script v0.6.6 ######################## ######################## Created by TB-14 ######################## -######################## 07 NOV 20 ######################## +######################## 08 NOV 20 ######################## ################################################################################ ################################################################################ # @@ -396,7 +396,7 @@ fi echo "80% Complete" NEWELECTRUM=$(curl -s https://github.com/spesmilo/electrum/blob/master/RELEASE-\ -NOTES | grep Release | head -n 2 | grep -o '[0-9].[0-9].[0-9]') +NOTES | grep Release | head -n 1 | grep -o '[0-9].[0-9].[0-9]') if [[ $NEWELECTRUM == "" ]]; then NEWELECTRUM="SERVER DOWN" fi @@ -2258,39 +2258,40 @@ sudo apt-get -y install fail2ban } function keepassxc_install() { -if [[ ${PLAT} = "Raspbian" ]]; then +#if [[ ${PLAT} = "Raspbian" ]]; then -if hash keepassxc 2>/dev/null; then +#if hash keepassxc 2>/dev/null; then - cd $SECDIR/keepassxc/ && git checkout master && git pull || - { ERRCODE="Failed to update KeepassXC"; errors; return; } - else - - sudo apt-get install -y make cmake qtbase5-dev libyubikey-dev \ - libykpers-1-dev libargon2-0-dev libgcrypt20 zlib1g libmicrohttpd-dev \ - libxi-dev libxtst-dev qtx11extras5-doc libsodium-dev qttools5-dev \ - libqrencode-dev libqt5svg5-dev asciidoctor libreadline-dev libqt5x11extras5-dev libquazip-dev qtbase5-private-dev || - { ERRCODE="Failed to get dependencies for KeepassXC"; errors; return; } - - git clone https://github.com/keepassxreboot/keepassxc.git $SECDIR/keepassxc || - { ERRCODE="Failed to download KeepassXC"; errors; return; } - - cd $SECDIR/keepassxc && git checkout master || - { ERRCODE="Failed to check out master branch of KeepassXC"; errors; return; } - - mkdir -p $SECDIR/keepassxc/build && cd $SECDIR/keepassxc/build || - { ERRCODE="Failed to create and enter KeepassXC build directory"; errors; return; } - - cmake -DWITH_XC_ALL=ON -DCMAKE_BUILD_TYPE=Release .. || - { ERRCODE="cmake failed to compile KeepassXC"; errors; return; } - - make -j8 || - { ERRCODE="Failed to make KeepassXC"; errors; return; } - - sudo make install || - { ERRCODE="Failed to install KeepassXC"; errors; return; } -fi -else +# cd $SECDIR/keepassxc/ && git checkout master && git pull || +# { ERRCODE="Failed to update KeepassXC"; errors; return; } +# else +# +# sudo apt-get install -y make cmake qtbase5-dev libyubikey-dev \ +# libykpers-1-dev libargon2-0-dev libgcrypt20 zlib1g libmicrohttpd-dev \ +# libxi-dev libxtst-dev qtx11extras5-doc libsodium-dev qttools5-dev \ +# libqrencode-dev libqt5svg5-dev asciidoctor libreadline-dev libqt5x11extras5-dev \ +# libquazip-dev qtbase5-private-dev || +# { ERRCODE="Failed to get dependencies for KeepassXC"; errors; return; } +# +# git clone https://github.com/keepassxreboot/keepassxc.git $SECDIR/keepassxc || +# { ERRCODE="Failed to download KeepassXC"; errors; return; } +# +# cd $SECDIR/keepassxc && git checkout master || +# { ERRCODE="Failed to check out master branch of KeepassXC"; errors; return; } +# +# mkdir -p $SECDIR/keepassxc/build && cd $SECDIR/keepassxc/build || +# { ERRCODE="Failed to create and enter KeepassXC build directory"; errors; return; } +# +# cmake -DWITH_XC_ALL=ON -DCMAKE_BUILD_TYPE=Release .. || +# { ERRCODE="cmake failed to compile KeepassXC"; errors; return; } +# +# make -j8 || +# { ERRCODE="Failed to make KeepassXC"; errors; return; } +# +# sudo make install || +# { ERRCODE="Failed to install KeepassXC"; errors; return; } +#fi +#else if hash snap 2>/dev/null; then sudo snap install core && sudo snap install keepassxc || { ERRCODE="Failed to install snap / snap core requirements for KeepassXC"; errors; return; } @@ -2301,7 +2302,7 @@ sudo apt-get install -y snapd && sudo snap install core && sudo snap install kee { ERRCODE="Failed to install snap / snap core requirements for KeepassXC"; errors; return; } fi -fi +#fi } diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 9d8d33a..73216fb 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,7 @@ +# Version 0.6.6 + - Changed KeepassXC on pi install to use snap installation. + - Corrected Electrum download link. + # Version 0.6.5 - Fixed more issues with Veracrypt. Now installs current version properly. - Added dependency for Chirp