diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh index 1437f3fb..90fcf110 100755 --- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh +++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh @@ -576,12 +576,6 @@ if should_install_app "joininbox" ; then chmod -R +x ./joininbox/ sudo -u joinmarket cp -rf ./joininbox/scripts/* . - # Apply patches - echo "" > set.password.sh - echo "" > standalone/expand.rootfs.sh - sudo -u joinmarket cp /usr/share/joininbox/menu.update.sh /home/joinmarket/menu.update.sh - sudo -u joinmarket sed -i "s|/home/joinmarket/menu.config.sh|echo 'mynode skip config'|g" /home/joinmarket/start.joininbox.sh - # Install sudo -u joinmarket bash -c "cd /home/joinmarket/; ./install.joinmarket.sh install" || true diff --git a/rootfs/standard/usr/share/joininbox/menu.update.sh b/rootfs/standard/usr/share/joininbox/menu.update.sh deleted file mode 100644 index 1a57a109..00000000 --- a/rootfs/standard/usr/share/joininbox/menu.update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -source /home/joinmarket/_functions.sh - -# BASIC MENU INFO -HEIGHT=12 -WIDTH=56 -CHOICE_HEIGHT=1 -TITLE="Update options" -MENU="Updates managed by myNode" -OPTIONS=() -BACKTITLE="JoininBox GUI" - -# Basic Options -OPTIONS+=(\ - RETURN "Back to main menu" \ -) - -CHOICE=$(dialog --clear \ - --backtitle "$BACKTITLE" \ - --title "$TITLE" \ - --menu "$MENU" \ - $HEIGHT $WIDTH $CHOICE_HEIGHT \ - "${OPTIONS[@]}" \ - 2>&1 >/dev/tty) - -case $CHOICE in - RETURN) - echo "" - ;; -esac \ 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 6a294895..62477c70 100644 --- a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh +++ b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh @@ -53,7 +53,7 @@ JOINMARKET_VERSION="v0.8.2" JOINMARKET_VERSION_FILE=/home/bitcoin/.mynode/joinmarket_version JOINMARKET_LATEST_VERSION_FILE=/home/bitcoin/.mynode/joinmarket_version_latest -JOININBOX_VERSION="v0.3.0" +JOININBOX_VERSION="v0.4.0" JOININBOX_VERSION_FILE=/home/bitcoin/.mynode/joininbox_version JOININBOX_LATEST_VERSION_FILE=/home/bitcoin/.mynode/joininbox_version_latest diff --git a/rootfs/standard/var/www/mynode/templates/includes/apps.html b/rootfs/standard/var/www/mynode/templates/includes/apps.html index aff5552b..78bf87aa 100644 --- a/rootfs/standard/var/www/mynode/templates/includes/apps.html +++ b/rootfs/standard/var/www/mynode/templates/includes/apps.html @@ -40,7 +40,7 @@