From c995fa21ca309c40ae5d5f989e1da9c96515a568 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Mon, 29 Jun 2020 18:52:07 +0200 Subject: [PATCH 1/8] Add bonus script: stacking-sats-kraken --- README.md | 1 + .../bonus.stacking-sats-kraken.sh | 124 ++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100755 home.admin/config.scripts/bonus.stacking-sats-kraken.sh diff --git a/README.md b/README.md index a14e77743..f1fa1f87b 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ There are further Services that can be switched on: * **Faraday** (Channel Analysis & Recommendations CLI) [details](https://github.com/lightninglabs/faraday/blob/master/README.md) * **Balance Of Satoshis** (Commands for working with LND balances) [details](https://github.com/alexbosworth/balanceofsatoshis/blob/master/README.md) * **Kindle Display** (Bitcoin Status Display made with a jailbroken Kindle) [details](https://github.com/dennisreimann/kindle-display) +* **Stacking Sats Kraken** (Auto-DCA script) [details](https://github.com/dennisreimann/stacking-sats-kraken) You can connect the following Wallet-Apps to your RaspiBlitz: diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh new file mode 100755 index 000000000..b8a693553 --- /dev/null +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -0,0 +1,124 @@ +#!/bin/bash + +# https://github.com/dennisreimann/stacking-sats-kraken + +USERNAME=stackingsats + +# command info +if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then + echo "small config script to switch stacking-sats-kraken on or off" + echo "bonus.stacking-sats-kraken.sh [on|off]" + exit 1 +fi + +# switch on +if [ "$1" = "1" ] || [ "$1" = "on" ]; then + echo "*** INSTALL STACKING-SATS-KRAKEN ***" + + isInstalled=$(sudo ls /home/$USERNAME 2>/dev/null | grep -c 'stacking-sats-kraken') + if [ ${isInstalled} -eq 0 ]; then + + # install nodeJS + /home/admin/config.scripts/bonus.nodejs.sh + + echo "*** Add the 'stackingsats' user ***" + sudo adduser --disabled-password --gecos "" $USERNAME + + # install stacking-sats-kraken + cd /home/$USERNAME + sudo -u $USERNAME git clone https://github.com/dennisreimann/stacking-sats-kraken.git stacking-sats-kraken + cd stacking-sats-kraken + sudo -u $USERNAME npm install + + # setup stacking config + configFile=/home/admin/stacking-sats-kraken.env + touch $configFile + sudo chmod 600 $configFile || exit 1 + cat > $configFile <&1) +else + result=$(npm test 2>&1) +fi +echo "$result" + +# optional: send email – requires `blitz.notify.sh on` +# /home/admin/config.scripts/blitz.notify.sh send "$result" --subject "Sats got stacked"' > $scriptFile + + sudo mv $scriptFile /home/$USERNAME/stack-sats-kraken.sh + sudo chown $USERNAME:$USERNAME /home/$USERNAME/stack-sats-kraken.sh + + echo "OK - the STACKING-SATS-KRAKEN script is now installed." + echo "" + echo "You need to adapt the settings in /home/$USERNAME/.config/stacking-sats-kraken.env" + + cron_count=$(crontab -l | grep "stack-sats.sh" -c) + if [ "${cron_count}" = "0" ]; then + echo "" + echo "You might want to set up a cronjob to run the script in regular intervals." + echo "Switch to the '$USERNAME' user and add it using the 'crontab -e' command." + echo "Here is an example for daily usage at 6:15am..." + echo "" + echo "15 6 * * * /home/$USERNAME/stack-sats.sh" + fi + else + echo "STACKING-SATS-KRAKEN already installed." + fi + + exit 0 +fi + +# switch off +if [ "$1" = "0" ] || [ "$1" = "off" ]; then + echo "*** UNINSTALL STACKING-SATS-KRAKEN ***" + isInstalled=$(sudo ls /home/$USERNAME 2>/dev/null | grep -c 'stacking-sats-kraken') + + if [ ${isInstalled} -eq 1 ]; then + echo "*** REMOVING STACKING-SATS-KRAKEN ***" + + sudo rm -rf /home/$USERNAME/stack-sats-kraken.sh + sudo rm -rf /home/$USERNAME/stacking-sats-kraken + sudo rm -f /home/$USERNAME/.config/stacking-sats-kraken.env + + echo "OK STACKING-SATS-KRAKEN removed." + + cron_count=$(crontab -l | grep "stack-sats.sh" -c) + if [ "${cron_count}" != "0" ]; then + echo "" + echo "You should remove any cronjob that ran the script." + fi + else + echo "STACKING-SATS-KRAKEN is not installed." + fi + + exit 0 +fi + +echo "FAIL - Unknown Parameter $1" +exit 1 From 4ed3c187762cacc16c61456e3269a962aa3c7307 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Mon, 29 Jun 2020 21:45:57 +0200 Subject: [PATCH 2/8] Stacking Sats Kraken: Config and bootstrap --- home.admin/_bootstrap.provision.sh | 11 +++++++++-- .../config.scripts/bonus.stacking-sats-kraken.sh | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh index ce477c946..38dae75d1 100644 --- a/home.admin/_bootstrap.provision.sh +++ b/home.admin/_bootstrap.provision.sh @@ -72,7 +72,7 @@ fi sudo chmod 777 ${configFile} source ${configFile} -# check if the system was configured for HDMI and needs switch +# check if the system was configured for HDMI and needs switch # keep as one of the first so that user can see video output if [ "${lcd2hdmi}" == "on" ]; then echo "RaspiBlitz has config to run with HDMI video outout." >> ${logFile} @@ -462,7 +462,14 @@ else echo "Provisioning kindle-display - keep default" >> ${logFile} fi - +# stacking-sats-kraken +if [ "${stackingSatsKraken}" = "on" ]; then + echo "Provisioning Stacking Sats Kraken - run config script" >> ${logFile} + sudo sed -i "s/^message=.*/message='Setup Stacking Sats Kraken'/g" ${infoFile} + sudo -u admin /home/admin/config.scripts/bonus.stacking-sats-kraken.sh on >> ${logFile} 2>&1 +else + echo "Provisioning Stacking Sats Kraken - keep default" >> ${logFile} +fi # replay backup LND conf & tlscerts # https://github.com/rootzoll/raspiblitz/issues/324 diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index b8a693553..07885a241 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -87,6 +87,9 @@ echo "$result" echo "" echo "15 6 * * * /home/$USERNAME/stack-sats.sh" fi + + # setting value in raspi blitz config + sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=on/g" /mnt/hdd/raspiblitz.conf else echo "STACKING-SATS-KRAKEN already installed." fi @@ -102,6 +105,9 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then if [ ${isInstalled} -eq 1 ]; then echo "*** REMOVING STACKING-SATS-KRAKEN ***" + # setting value in raspi blitz config + sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=off/g" /mnt/hdd/raspiblitz.conf + sudo rm -rf /home/$USERNAME/stack-sats-kraken.sh sudo rm -rf /home/$USERNAME/stacking-sats-kraken sudo rm -f /home/$USERNAME/.config/stacking-sats-kraken.env From feba4c313704424a8f48a04b243dc540bafb0ddf Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Mon, 29 Jun 2020 22:30:01 +0200 Subject: [PATCH 3/8] Stacking Sats Kraken: Improve data location and script --- .../bonus.stacking-sats-kraken.sh | 68 ++++++++++++------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index 07885a241..41e37bf1d 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -3,6 +3,8 @@ # https://github.com/dennisreimann/stacking-sats-kraken USERNAME=stackingsats +CONFIG_FILE=/mnt/hdd/app-data/stacking-sats-kraken/.env +SCRIPT_NAME=stack-sats.sh # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then @@ -26,28 +28,36 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # install stacking-sats-kraken cd /home/$USERNAME - sudo -u $USERNAME git clone https://github.com/dennisreimann/stacking-sats-kraken.git stacking-sats-kraken + sudo -u $USERNAME git clone https://github.com/dennisreimann/stacking-sats-kraken.git cd stacking-sats-kraken sudo -u $USERNAME npm install # setup stacking config + sudo mkdir /mnt/hdd/app-data/stacking-sats-kraken + sudo chown $USERNAME:$USERNAME /mnt/hdd/app-data/stacking-sats-kraken + configFile=/home/admin/stacking-sats-kraken.env touch $configFile sudo chmod 600 $configFile || exit 1 - cat > $configFile < $configFile + sudo mv $configFile $CONFIG_FILE + sudo chown $USERNAME:$USERNAME $CONFIG_FILE # setup stacking script - scriptFile=/home/admin/stack-sats-kraken.sh + scriptFile="/home/admin/$SCRIPT_NAME" touch $scriptFile sudo chmod 700 $scriptFile || exit 1 echo '#!/bin/bash @@ -57,7 +67,7 @@ set -e export NODE_OPTIONS="--no-deprecation" # load config -set -a; source ~/.config/stacking-sats-kraken.env; set +a +set -a; source /mnt/hdd/app-data/stacking-sats-kraken/.env; set +a # run script cd ~/stacking-sats-kraken @@ -68,25 +78,21 @@ else fi echo "$result" -# optional: send email – requires `blitz.notify.sh on` -# /home/admin/config.scripts/blitz.notify.sh send "$result" --subject "Sats got stacked"' > $scriptFile +# send email +if [[ ${KRAKEN_MAIL_SUBJECT} && ${KRAKEN_MAIL_FROM_ADDRESS} && ${KRAKEN_MAIL_FROM_NAME} ]]; then + /home/admin/config.scripts/blitz.notify.sh send "$result" \ + --subject "$KRAKEN_MAIL_SUBJECT" \ + --from-name "$KRAKEN_MAIL_FROM_NAME" \ + --from-address "$KRAKEN_MAIL_FROM_ADDRESS" +fi +' > $scriptFile - sudo mv $scriptFile /home/$USERNAME/stack-sats-kraken.sh - sudo chown $USERNAME:$USERNAME /home/$USERNAME/stack-sats-kraken.sh + sudo mv $scriptFile /home/$USERNAME/$SCRIPT_NAME + sudo chown $USERNAME:$USERNAME /home/$USERNAME/$SCRIPT_NAME echo "OK - the STACKING-SATS-KRAKEN script is now installed." echo "" - echo "You need to adapt the settings in /home/$USERNAME/.config/stacking-sats-kraken.env" - - cron_count=$(crontab -l | grep "stack-sats.sh" -c) - if [ "${cron_count}" = "0" ]; then - echo "" - echo "You might want to set up a cronjob to run the script in regular intervals." - echo "Switch to the '$USERNAME' user and add it using the 'crontab -e' command." - echo "Here is an example for daily usage at 6:15am..." - echo "" - echo "15 6 * * * /home/$USERNAME/stack-sats.sh" - fi + echo "Switch to the '$USERNAME' user and adapt the settings in $CONFIG_FILE" # setting value in raspi blitz config sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=on/g" /mnt/hdd/raspiblitz.conf @@ -94,6 +100,17 @@ echo "$result" echo "STACKING-SATS-KRAKEN already installed." fi + cron_count=$(sudo -u $USERNAME crontab -l | grep "$SCRIPT_NAME" -c) + if [ "${cron_count}" = "0" ]; then + echo "" + echo "You might want to set up a cronjob to run the script in regular intervals." + echo "As the '$USERNAME' user you can run the 'crontab -e' command." + echo "" + echo "Here is an example for daily usage at 6:15am ..." + echo "" + echo "15 6 * * * /home/$USERNAME/$SCRIPT_NAME" + fi + exit 0 fi @@ -108,13 +125,14 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then # setting value in raspi blitz config sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=off/g" /mnt/hdd/raspiblitz.conf - sudo rm -rf /home/$USERNAME/stack-sats-kraken.sh + # remove script and config + sudo rm -rf /home/$USERNAME/$SCRIPT_NAME sudo rm -rf /home/$USERNAME/stacking-sats-kraken - sudo rm -f /home/$USERNAME/.config/stacking-sats-kraken.env + sudo rm -rf /mnt/hdd/app-data/stacking-sats-kraken echo "OK STACKING-SATS-KRAKEN removed." - cron_count=$(crontab -l | grep "stack-sats.sh" -c) + cron_count=$(sudo -u $USERNAME crontab -l | grep "$SCRIPT_NAME" -c) if [ "${cron_count}" != "0" ]; then echo "" echo "You should remove any cronjob that ran the script." From 32f1a0c54e4de8c1ba406d1d4468d34e61b440d2 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 30 Jun 2020 12:18:57 +0200 Subject: [PATCH 4/8] Stacking Sats Kraken: Improve cleanup --- .../bonus.stacking-sats-kraken.sh | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index 41e37bf1d..c1aeb60a6 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -3,7 +3,9 @@ # https://github.com/dennisreimann/stacking-sats-kraken USERNAME=stackingsats -CONFIG_FILE=/mnt/hdd/app-data/stacking-sats-kraken/.env +APP_DATA_DIR=/mnt/hdd/app-data/stacking-sats-kraken +HOME_DIR=/home/$USERNAME +CONFIG_FILE=$APP_DATA_DIR/.env SCRIPT_NAME=stack-sats.sh # command info @@ -17,24 +19,24 @@ fi if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "*** INSTALL STACKING-SATS-KRAKEN ***" - isInstalled=$(sudo ls /home/$USERNAME 2>/dev/null | grep -c 'stacking-sats-kraken') + isInstalled=$(sudo ls $HOME_DIR 2>/dev/null | grep -c 'stacking-sats-kraken') if [ ${isInstalled} -eq 0 ]; then # install nodeJS /home/admin/config.scripts/bonus.nodejs.sh - echo "*** Add the 'stackingsats' user ***" + # add user sudo adduser --disabled-password --gecos "" $USERNAME # install stacking-sats-kraken - cd /home/$USERNAME + cd $HOME_DIR sudo -u $USERNAME git clone https://github.com/dennisreimann/stacking-sats-kraken.git cd stacking-sats-kraken sudo -u $USERNAME npm install # setup stacking config - sudo mkdir /mnt/hdd/app-data/stacking-sats-kraken - sudo chown $USERNAME:$USERNAME /mnt/hdd/app-data/stacking-sats-kraken + sudo mkdir $APP_DATA_DIR + sudo chown $USERNAME:$USERNAME $APP_DATA_DIR configFile=/home/admin/stacking-sats-kraken.env touch $configFile @@ -57,7 +59,7 @@ KRAKEN_DRY_RUN_PLACE_NO_ORDER=1 sudo chown $USERNAME:$USERNAME $CONFIG_FILE # setup stacking script - scriptFile="/home/admin/$SCRIPT_NAME" + scriptFile="$HOME_DIR/$SCRIPT_NAME" touch $scriptFile sudo chmod 700 $scriptFile || exit 1 echo '#!/bin/bash @@ -87,8 +89,8 @@ if [[ ${KRAKEN_MAIL_SUBJECT} && ${KRAKEN_MAIL_FROM_ADDRESS} && ${KRAKEN_MAIL_FRO fi ' > $scriptFile - sudo mv $scriptFile /home/$USERNAME/$SCRIPT_NAME - sudo chown $USERNAME:$USERNAME /home/$USERNAME/$SCRIPT_NAME + sudo mv $scriptFile $HOME_DIR/$SCRIPT_NAME + sudo chown $USERNAME:$USERNAME $HOME_DIR/$SCRIPT_NAME echo "OK - the STACKING-SATS-KRAKEN script is now installed." echo "" @@ -108,7 +110,7 @@ fi echo "" echo "Here is an example for daily usage at 6:15am ..." echo "" - echo "15 6 * * * /home/$USERNAME/$SCRIPT_NAME" + echo "15 6 * * * $HOME_DIR/$SCRIPT_NAME" fi exit 0 @@ -117,7 +119,7 @@ fi # switch off if [ "$1" = "0" ] || [ "$1" = "off" ]; then echo "*** UNINSTALL STACKING-SATS-KRAKEN ***" - isInstalled=$(sudo ls /home/$USERNAME 2>/dev/null | grep -c 'stacking-sats-kraken') + isInstalled=$(sudo ls $HOME_DIR 2>/dev/null | grep -c 'stacking-sats-kraken') if [ ${isInstalled} -eq 1 ]; then echo "*** REMOVING STACKING-SATS-KRAKEN ***" @@ -125,18 +127,13 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then # setting value in raspi blitz config sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=off/g" /mnt/hdd/raspiblitz.conf - # remove script and config - sudo rm -rf /home/$USERNAME/$SCRIPT_NAME - sudo rm -rf /home/$USERNAME/stacking-sats-kraken - sudo rm -rf /mnt/hdd/app-data/stacking-sats-kraken + # remove sconfig + sudo rm -rf $APP_DATA_DIR + + # delete user and home directory + sudo userdel -rf $USERNAME echo "OK STACKING-SATS-KRAKEN removed." - - cron_count=$(sudo -u $USERNAME crontab -l | grep "$SCRIPT_NAME" -c) - if [ "${cron_count}" != "0" ]; then - echo "" - echo "You should remove any cronjob that ran the script." - fi else echo "STACKING-SATS-KRAKEN is not installed." fi From 7c9e7472f9a962f20e506df5a92cfca2d9de2a40 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 1 Jul 2020 09:53:24 +0200 Subject: [PATCH 5/8] Stacking Sats Kraken: Finetuning t --- .../bonus.stacking-sats-kraken.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index c1aeb60a6..a31e05154 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -6,7 +6,7 @@ USERNAME=stackingsats APP_DATA_DIR=/mnt/hdd/app-data/stacking-sats-kraken HOME_DIR=/home/$USERNAME CONFIG_FILE=$APP_DATA_DIR/.env -SCRIPT_NAME=stack-sats.sh +SCRIPT_NAME=stacksats.sh # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then @@ -23,7 +23,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then if [ ${isInstalled} -eq 0 ]; then # install nodeJS - /home/admin/config.scripts/bonus.nodejs.sh + /home/admin/config.scripts/bonus.nodejs.sh on # add user sudo adduser --disabled-password --gecos "" $USERNAME @@ -72,16 +72,16 @@ export NODE_OPTIONS="--no-deprecation" set -a; source /mnt/hdd/app-data/stacking-sats-kraken/.env; set +a # run script -cd ~/stacking-sats-kraken -if [[ -z "${KRAKEN_DRY_RUN_PLACE_NO_ORDER}" ]]; then - result=$(npm run stack-sats 2>&1) +cd ./stacking-sats-kraken +if [[ "${KRAKEN_DRY_RUN_PLACE_NO_ORDER}" ]]; then + result=$(node index.js --validate 2>&1) else - result=$(npm test 2>&1) + result=$(node index.js 2>&1) fi echo "$result" # send email -if [[ ${KRAKEN_MAIL_SUBJECT} && ${KRAKEN_MAIL_FROM_ADDRESS} && ${KRAKEN_MAIL_FROM_NAME} ]]; then +if [[ "${KRAKEN_MAIL_SUBJECT}" && "${KRAKEN_MAIL_FROM_ADDRESS}" && "${KRAKEN_MAIL_FROM_NAME}" ]]; then /home/admin/config.scripts/blitz.notify.sh send "$result" \ --subject "$KRAKEN_MAIL_SUBJECT" \ --from-name "$KRAKEN_MAIL_FROM_NAME" \ @@ -110,7 +110,9 @@ fi echo "" echo "Here is an example for daily usage at 6:15am ..." echo "" - echo "15 6 * * * $HOME_DIR/$SCRIPT_NAME" + echo "SHELL=/bin/bash" + echo "PATH=/bin:/usr/sbin/usr/bin:/usr/local/bin" + echo "15 6 * * * $HOME_DIR/$SCRIPT_NAME > /dev/null 2>&1" fi exit 0 From b312bf0caae6365e382bdddf980e2c00f6fb2374 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 1 Jul 2020 13:44:02 +0200 Subject: [PATCH 6/8] Stacking Sats Kraken: Use tagged version instead of master --- home.admin/config.scripts/bonus.stacking-sats-kraken.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index a31e05154..2ad846504 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -7,6 +7,7 @@ APP_DATA_DIR=/mnt/hdd/app-data/stacking-sats-kraken HOME_DIR=/home/$USERNAME CONFIG_FILE=$APP_DATA_DIR/.env SCRIPT_NAME=stacksats.sh +SCRIPT_VERSION=0.2.0 # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then @@ -30,7 +31,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # install stacking-sats-kraken cd $HOME_DIR - sudo -u $USERNAME git clone https://github.com/dennisreimann/stacking-sats-kraken.git + sudo -u $USERNAME wget https://github.com/dennisreimann/stacking-sats-kraken/archive/v$SCRIPT_VERSION.tar.gz + sudo -u $USERNAME tar -xzf v$SCRIPT_VERSION.tar.gz + sudo -u $USERNAME mv stacking-sats-kraken{-$SCRIPT_VERSION,} + sudo -u $USERNAME rm v$SCRIPT_VERSION.tar.gz cd stacking-sats-kraken sudo -u $USERNAME npm install From 6865f849ac2a8f2f4caf6d096930f8704929c684 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 1 Jul 2020 16:04:21 +0200 Subject: [PATCH 7/8] Stacking Sats Kraken: Better restore handling --- .../config.scripts/bonus.stacking-sats-kraken.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index 2ad846504..2ba5b6eb4 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -39,12 +39,13 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then sudo -u $USERNAME npm install # setup stacking config - sudo mkdir $APP_DATA_DIR + sudo mkdir -p $APP_DATA_DIR sudo chown $USERNAME:$USERNAME $APP_DATA_DIR - configFile=/home/admin/stacking-sats-kraken.env - touch $configFile - sudo chmod 600 $configFile || exit 1 + if [[ ! -f "$CONFIG_FILE" ]]; then + configFile=/home/admin/stacking-sats-kraken.env + touch $configFile + sudo chmod 600 $configFile || exit 1 echo '# Required settings KRAKEN_API_KEY="apiKeyFromTheKrakenSettings" KRAKEN_API_SECRET="privateKeyFromTheKrakenSettings" @@ -59,7 +60,9 @@ KRAKEN_BUY_AMOUNT=21 # Remove this line after verifying everything works KRAKEN_DRY_RUN_PLACE_NO_ORDER=1 ' > $configFile - sudo mv $configFile $CONFIG_FILE + sudo mv $configFile $CONFIG_FILE + fi + sudo chown $USERNAME:$USERNAME $CONFIG_FILE # setup stacking script @@ -133,7 +136,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then # setting value in raspi blitz config sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=off/g" /mnt/hdd/raspiblitz.conf - # remove sconfig + # remove config sudo rm -rf $APP_DATA_DIR # delete user and home directory From 54f224aff367fd9d6f5bbd2d7eb397e5be0fd35d Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Mon, 6 Jul 2020 17:34:17 +0200 Subject: [PATCH 8/8] Stacking Sats Kraken: Fixes fix --- home.admin/config.scripts/bonus.stacking-sats-kraken.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh index 2ba5b6eb4..a18ff9bdb 100755 --- a/home.admin/config.scripts/bonus.stacking-sats-kraken.sh +++ b/home.admin/config.scripts/bonus.stacking-sats-kraken.sh @@ -6,6 +6,7 @@ USERNAME=stackingsats APP_DATA_DIR=/mnt/hdd/app-data/stacking-sats-kraken HOME_DIR=/home/$USERNAME CONFIG_FILE=$APP_DATA_DIR/.env +RASPIBLITZ_FILE=/mnt/hdd/raspiblitz.conf SCRIPT_NAME=stacksats.sh SCRIPT_VERSION=0.2.0 @@ -66,7 +67,7 @@ KRAKEN_DRY_RUN_PLACE_NO_ORDER=1 sudo chown $USERNAME:$USERNAME $CONFIG_FILE # setup stacking script - scriptFile="$HOME_DIR/$SCRIPT_NAME" + scriptFile="/home/admin/$SCRIPT_NAME" touch $scriptFile sudo chmod 700 $scriptFile || exit 1 echo '#!/bin/bash @@ -104,7 +105,7 @@ fi echo "Switch to the '$USERNAME' user and adapt the settings in $CONFIG_FILE" # setting value in raspi blitz config - sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=on/g" /mnt/hdd/raspiblitz.conf + grep -q '^stackingSatsKraken' $RASPIBLITZ_FILE && sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=on/g" $RASPIBLITZ_FILE || echo 'stackingSatsKraken=on' >> $RASPIBLITZ_FILE else echo "STACKING-SATS-KRAKEN already installed." fi @@ -118,7 +119,7 @@ fi echo "Here is an example for daily usage at 6:15am ..." echo "" echo "SHELL=/bin/bash" - echo "PATH=/bin:/usr/sbin/usr/bin:/usr/local/bin" + echo "PATH=/bin:/usr/sbin:/usr/bin:/usr/local/bin" echo "15 6 * * * $HOME_DIR/$SCRIPT_NAME > /dev/null 2>&1" fi @@ -134,7 +135,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then echo "*** REMOVING STACKING-SATS-KRAKEN ***" # setting value in raspi blitz config - sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=off/g" /mnt/hdd/raspiblitz.conf + sudo sed -i "s/^stackingSatsKraken=.*/stackingSatsKraken=off/g" $RASPIBLITZ_FILE # remove config sudo rm -rf $APP_DATA_DIR