From feb4e05f53058118688e7bd5e839d0682cbad99d Mon Sep 17 00:00:00 2001 From: tb14 Date: Sat, 7 Nov 2020 22:19:08 -0800 Subject: [PATCH] Fixed Direwolf fail to compile Fixed Keepassxc failure to compile, still troubleshooting running issues. Fixed Veracrypt broken link. --- AmRRON-Setup-Script.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index bba6ef8..bedf2a4 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -403,7 +403,7 @@ fi echo "90% Complete" -NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/

Latest\ Stable\ Release\ -\ //p' | awk -F '(' '{print $1}' | sed 's/.$//') +NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/

Latest\ Stable\ Release:\ //p' | awk -F '(' '{print $1}' | sed 's/.$//') if [[ $NEWVC == "" ]]; then NEWVC="SERVER DOWN" fi @@ -1744,7 +1744,7 @@ function direwolf_install() { cd $PACKETDIR && git clone https://www.github.com/wb2osz/direwolf || { ERRCODE="Failed to download Direwolf"; errors; return; } - cd direwolf && make && sudo make install && make install-conf || + mkdir $PACKETDIR/direwolf/build && cd $PACKETDIR/direwolf/build && cmake .. && make -j4 && sudo make install && make install-conf || { ERRCODE="Failed to compile Direwolf"; errors; return; } fi @@ -2269,7 +2269,7 @@ if hash keepassxc 2>/dev/null; then 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 || + 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 ||