From 6ff829f445e75694b916731355f3d701157c88d4 Mon Sep 17 00:00:00 2001 From: Taylor Helsper Date: Mon, 31 Oct 2022 23:27:30 -0500 Subject: [PATCH] Fix Warden Terminal install --- .../standard/usr/bin/mynode_post_upgrade.sh | 24 +++++++++---------- .../bin/mynode_update_latest_version_files.sh | 2 +- .../usr/share/mynode/mynode_app_versions.sh | 8 +++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh index 07efefed..13cffcff 100755 --- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh +++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh @@ -939,21 +939,21 @@ fi # Upgrade WARden -if should_install_app "warden" ; then - WARDEN_UPGRADE_URL=https://github.com/pxsocs/warden/archive/refs/tags/$WARDEN_VERSION.tar.gz +if should_install_app "wardenterminal" ; then + WARDENTERMINAL_UPGRADE_URL=https://github.com/pxsocs/warden_terminal/archive/$WARDENTERMINAL_VERSION.tar.gz CURRENT="" - if [ -f $WARDEN_VERSION_FILE ]; then - CURRENT=$(cat $WARDEN_VERSION_FILE) + if [ -f $WARDENTERMINAL_VERSION_FILE ]; then + CURRENT=$(cat $WARDENTERMINAL_VERSION_FILE) fi - if [ "$CURRENT" != "$WARDEN_VERSION" ]; then + if [ "$CURRENT" != "$WARDENTERMINAL_VERSION" ]; then cd /opt/mynode - rm -rf warden + rm -rf wardenterminal - sudo -u bitcoin wget $WARDEN_UPGRADE_URL -O warden.tar.gz - sudo -u bitcoin tar -xvf warden.tar.gz - sudo -u bitcoin rm warden.tar.gz - sudo -u bitcoin mv warden-* warden - cd warden + sudo -u bitcoin wget $WARDENTERMINAL_UPGRADE_URL -O wardenterminal.tar.gz + sudo -u bitcoin tar -xvf wardenterminal.tar.gz + sudo -u bitcoin rm wardenterminal.tar.gz + sudo -u bitcoin mv warden_terminal-* wardenterminal + cd wardenterminal # Make venv if [ ! -d env ]; then @@ -963,7 +963,7 @@ if should_install_app "warden" ; then pip3 install -r requirements.txt deactivate - echo $WARDEN_VERSION > $WARDEN_VERSION_FILE + echo $WARDENTERMINAL_VERSION > $WARDENTERMINAL_VERSION_FILE fi fi diff --git a/rootfs/standard/usr/bin/mynode_update_latest_version_files.sh b/rootfs/standard/usr/bin/mynode_update_latest_version_files.sh index c03776a8..08b018db 100755 --- a/rootfs/standard/usr/bin/mynode_update_latest_version_files.sh +++ b/rootfs/standard/usr/bin/mynode_update_latest_version_files.sh @@ -30,4 +30,4 @@ echo $SPHINXRELAY_VERSION > $SPHINXRELAY_LATEST_VERSION_FILE echo $NETDATA_VERSION > $NETDATA_LATEST_VERSION_FILE echo $WEBSSH2_VERSION > $WEBSSH2_LATEST_VERSION_FILE echo $PYBLOCK_VERSION > $PYBLOCK_LATEST_VERSION_FILE -echo $WARDEN_VERSION > $WARDEN_LATEST_VERSION_FILE \ No newline at end of file +echo $WARDENTERMINAL_VERSION > $WARDENTERMINAL_LATEST_VERSION_FILE \ No newline at end of file diff --git a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh index 336f6990..d474b9a9 100644 --- a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh +++ b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh @@ -167,10 +167,10 @@ PYBLOCK_VERSION=$(get_app_version "$PYBLOCK_VERSION" "pyblock") PYBLOCK_VERSION_FILE=/home/bitcoin/.mynode/pyblock_version PYBLOCK_LATEST_VERSION_FILE=/home/bitcoin/.mynode/pyblock_version_latest -WARDEN_VERSION="0.91" -WARDEN_VERSION=$(get_app_version "$WARDEN_VERSION" "warden") -WARDEN_VERSION_FILE=/home/bitcoin/.mynode/warden_version -WARDEN_LATEST_VERSION_FILE=/home/bitcoin/.mynode/warden_version_latest +WARDENTERMINAL_VERSION="869bb48453e9444691c27d2c8908abf2694094ea" +WARDENTERMINAL_VERSION=$(get_app_version "$WARDENTERMINAL_VERSION" "wardenterminal") +WARDENTERMINAL_VERSION_FILE=/home/bitcoin/.mynode/wardenterminal_version +WARDENTERMINAL_LATEST_VERSION_FILE=/home/bitcoin/.mynode/wardenterminal_version_latest NETDATA_VERSION="v1.32.1" NETDATA_VERSION=$(get_app_version "$NETDATA_VERSION" "netdata")