From af65af5e14ed9e41fe0ba592f66f3bf54b4c6f6f Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:43:33 +0100
Subject: [PATCH] mempool update to v2.5.0 (#4353)

* formatting
* mempool update to v2.5.0
* fix shellcheck warns
* check for command outcomes directly
* use npm ci, exit on failed install
* use npm ci in update

Co-authored-by: Christoph Stenglein <9399034+cstenglein@users.noreply.github.com>
---
 home.admin/config.scripts/bonus.mempool.sh | 159 ++++++++++-----------
 1 file changed, 75 insertions(+), 84 deletions(-)

diff --git a/home.admin/config.scripts/bonus.mempool.sh b/home.admin/config.scripts/bonus.mempool.sh
index bfc743643..b47bbfc30 100755
--- a/home.admin/config.scripts/bonus.mempool.sh
+++ b/home.admin/config.scripts/bonus.mempool.sh
@@ -2,7 +2,7 @@
 
 # https://github.com/mempool/mempool
 
-pinnedVersion="v2.4.0"
+pinnedVersion="v2.5.0"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@@ -135,40 +135,36 @@ if [ "$1" = "install" ]; then
   sudo adduser --system --group --home /home/mempool mempool
 
   # install mempool
-  cd /home/mempool
+  cd /home/mempool || exit 1
   sudo -u mempool git clone https://github.com/mempool/mempool.git
-  cd mempool
+  cd mempool || exit 1
   sudo -u mempool git reset --hard $pinnedVersion
   sudo -u mempool /home/admin/config.scripts/blitz.git-verify.sh "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
 
   echo "# npm install for mempool explorer (frontend)"
 
-  cd frontend
-  sudo -u mempool NG_CLI_ANALYTICS=false npm install --no-optional
-  if ! [ $? -eq 0 ]; then
-      echo "FAIL - npm install did not run correctly, aborting"
-      exit 1
+  cd frontend || exit 1
+  if ! sudo -u mempool NG_CLI_ANALYTICS=false npm ci; then
+    echo "FAIL - npm install did not run correctly, aborting"
+    exit 1
   fi
-  sudo -u mempool NG_CLI_ANALYTICS=false npm run build
-  if ! [ $? -eq 0 ]; then
-      echo "FAIL - npm run build did not run correctly, aborting (1)"
-      exit 1
+  if ! sudo -u mempool NG_CLI_ANALYTICS=false npm run build; then
+    echo "FAIL - npm run build did not run correctly, aborting (1)"
+    exit 1
   fi
 
   echo "# npm install for mempool explorer (backend)"
 
-  cd ../backend/
-  sudo -u mempool NG_CLI_ANALYTICS=false npm install --no-optional
-  if ! [ $? -eq 0 ]; then
-      echo "# FAIL - npm install did not run correctly, aborting"
-      echo "result='failed npm install'"
-      exit 1
+  cd ../backend/ || exit 1
+  if ! sudo -u mempool NG_CLI_ANALYTICS=false npm ci; then
+    echo "# FAIL - npm install did not run correctly, aborting"
+    echo "result='failed npm install'"
+    exit 1
   fi
-  sudo -u mempool NG_CLI_ANALYTICS=false npm run build
-  if ! [ $? -eq 0 ]; then
-      echo "# FAIL - npm run build did not run correctly, aborting (2)"
-      echo "result='failed npm run build'"
-      exit 1
+  if ! sudo -u mempool NG_CLI_ANALYTICS=false npm run build; then
+    echo "# FAIL - npm run build did not run correctly, aborting (2)"
+    echo "result='failed npm run build'"
+    exit 1
   fi
 
   exit 0
@@ -198,7 +194,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   isInstalled=$(compgen -u | grep -c mempool)
   if [ "${isInstalled}" == "0" ]; then
     echo "# Install code base first ...."
-    /home/admin/config.scripts/bonus.mempool.sh install
+    if ! /home/admin/config.scripts/bonus.mempool.sh install; then
+      echo "FAIL - install did not run correctly, aborting"
+      exit 1
+    fi
   fi
 
   echo "# *** Activate MEMPOOL ***"
@@ -214,7 +213,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo mariadb -e "GRANT ALL PRIVILEGES ON mempool.* TO 'mempool' IDENTIFIED BY 'mempool';"
     sudo mariadb -e "FLUSH PRIVILEGES;"
     if [ -f "mariadb-structure.sql" ]; then
-      mariadb -umempool -pmempool mempool < mariadb-structure.sql
+      mariadb -umempool -pmempool mempool <mariadb-structure.sql
     fi
 
     # prepare .env file
@@ -225,7 +224,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
 
     touch /var/cache/raspiblitz/mempool-config.json
     chmod 600 /var/cache/raspiblitz/mempool-config.json || exit 1
-    cat > /var/cache/raspiblitz/mempool-config.json <<EOF
+    cat >/var/cache/raspiblitz/mempool-config.json <<EOF
 {
   "MEMPOOL": {
     "NETWORK": "mainnet",
@@ -262,7 +261,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
 EOF
     sudo mv /var/cache/raspiblitz/mempool-config.json /home/mempool/mempool/backend/mempool-config.json
     sudo chown mempool:mempool /home/mempool/mempool/backend/mempool-config.json
-    cd /home/mempool/mempool/frontend
+    cd /home/mempool/mempool/frontend || exit 1
 
     sudo mkdir -p /mnt/hdd/app-storage/mempool/cache
     sudo chown mempool:mempool /mnt/hdd/app-storage/mempool/cache
@@ -297,7 +296,7 @@ EOF
 
     # install service
     echo "*** Install mempool systemd ***"
-    cat > /var/cache/raspiblitz/mempool.service <<EOF
+    cat >/var/cache/raspiblitz/mempool.service <<EOF
 # systemd unit for Mempool
 
 [Unit]
@@ -341,8 +340,8 @@ EOF
     sleep 10
 
     # check install success by testing backend
-  isWorking=$(sudo systemctl status mempool | grep -c "Active: active")
-  if [ ${isWorking} -lt 1 ]; then
+    isWorking=$(sudo systemctl status mempool | grep -c "Active: active")
+    if [ ${isWorking} -lt 1 ]; then
       # signal an error to WebUI
       echo "result='mempool service not active'"
       exit 1
@@ -364,11 +363,10 @@ EOF
     /home/admin/config.scripts/tor.onion-service.sh mempool 80 4082 443 4083
   fi
 
-  # needed for API/WebUI as signal that install ran thru 
+  # needed for API/WebUI as signal that install ran thru
   echo "result='OK'"
   exit 0
 
-  
 fi
 
 # switch off
@@ -413,7 +411,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
   # setting value in raspi blitz config
   /home/admin/config.scripts/blitz.conf.sh set mempoolExplorer "off"
 
-  # needed for API/WebUI as signal that install ran thru 
+  # needed for API/WebUI as signal that install ran thru
   echo "result='OK'"
   exit 0
 fi
@@ -422,73 +420,66 @@ fi
 if [ "$1" = "update" ]; then
   echo "*** Checking Mempool Explorer Version ***"
 
-  cd /home/mempool/mempool
+  cd /home/mempool/mempool || exit 1
 
   localVersion=$(git describe --tag)
-  updateVersion=$(curl --header "X-GitHub-Api-Version:2022-11-28" -s https://api.github.com/repos/mempool/mempool/releases/latest|grep tag_name|head -1|cut -d '"' -f4)
+  updateVersion=$(curl --header "X-GitHub-Api-Version:2022-11-28" -s https://api.github.com/repos/mempool/mempool/releases/latest | grep tag_name | head -1 | cut -d '"' -f4)
 
   if [ $localVersion = $updateVersion ]; then
-      echo "***  You are up-to-date on version $localVersion ***"
-      sudo systemctl restart mempool 2>/dev/null
-      echo "***  Restarting Mempool  ***"
+    echo "***  You are up-to-date on version $localVersion ***"
+    sudo systemctl restart mempool 2>/dev/null
+    echo "***  Restarting Mempool  ***"
   else
-      # Preserve Config
-      sudo cp backend/mempool-config.json /home/admin
+    # Preserve Config
+    sudo cp backend/mempool-config.json /home/admin
 
-      sudo -u mempool git fetch
-      sudo -u mempool git checkout $updateVersion
+    sudo -u mempool git fetch
+    sudo -u mempool git checkout $updateVersion
 
-      echo "# npm install for mempool explorer (backend)"
+    echo "# npm install for mempool explorer (backend)"
 
-      cd /home/mempool/mempool/backend/
+    cd /home/mempool/mempool/backend/ || exit 1
+    if ! sudo -u mempool NG_CLI_ANALYTICS=false npm ci; then
+      echo "FAIL - npm install did not run correctly, aborting"
+      exit 1
+    fi
+    if ! sudo -u mempool NG_CLI_ANALYTICS=false npm run build; then
+      echo "FAIL - npm run build did not run correctly, aborting (3)"
+      exit 1
+    fi
 
-      sudo -u mempool NG_CLI_ANALYTICS=false npm install
-      if ! [ $? -eq 0 ]; then
-          echo "FAIL - npm install did not run correctly, aborting"
-          exit 1
-      fi
-      sudo -u mempool NG_CLI_ANALYTICS=false npm run build
-      if ! [ $? -eq 0 ]; then
-          echo "FAIL - npm run build did not run correctly, aborting (3)"
-          exit 1
-      fi
+    echo "# npm install for mempool explorer (frontend)"
 
-      echo "# npm install for mempool explorer (frontend)"
+    cd ../frontend || exit 1
+    if ! sudo -u mempool NG_CLI_ANALYTICS=false npm ci; then
+      echo "FAIL - npm install did not run correctly, aborting"
+      exit 1
+    fi
+    if ! sudo -u mempool NG_CLI_ANALYTICS=false npm run build; then
+      echo "FAIL - npm run build did not run correctly, aborting (4)"
+      exit 1
+    fi
 
-      cd ../frontend
-      sudo -u mempool NG_CLI_ANALYTICS=false npm install
-      if ! [ $? -eq 0 ]; then
-          echo "FAIL - npm install did not run correctly, aborting"
-          exit 1
-      fi
-      sudo -u mempool NG_CLI_ANALYTICS=false npm run build
-      if ! [ $? -eq 0 ]; then
-          echo "FAIL - npm run build did not run correctly, aborting (4)"
-          exit 1
-      fi
+    sudo mv /home/admin/mempool-config.json /home/mempool/mempool/backend/mempool-config.json
+    sudo chown mempool:mempool /home/mempool/mempool/backend/mempool-config.json
 
-      sudo mv /home/admin/mempool-config.json /home/mempool/mempool/backend/mempool-config.json
-      sudo chown mempool:mempool /home/mempool/mempool/backend/mempool-config.json
+    # Restore frontend files
+    cd /home/mempool/mempool/frontend || exit 1
+    sudo rsync -I -av --delete dist/mempool/ /var/www/mempool/
+    sudo chown -R www-data:www-data /var/www/mempool
 
+    cd /home/mempool/mempool || exit 1
 
-      # Restore frontend files
-      cd /home/mempool/mempool/frontend
-      sudo rsync -I -av --delete dist/mempool/ /var/www/mempool/
-      sudo chown -R www-data:www-data /var/www/mempool
+    # Reinstall the mempool configuration for nginx
+    cp nginx.conf nginx-mempool.conf /etc/nginx/nginx.conf
+    sudo systemctl restart nginx
 
-      cd /home/mempool/mempool
+    # Remove useless deps
+    echo "Removing unnecessary modules..."
+    npm prune --production
 
-      # Reinstall the mempool configuration for nginx
-      cp nginx.conf nginx-mempool.conf /etc/nginx/nginx.conf
-      sudo systemctl restart nginx
-
-      # Remove useless deps
-      echo "Removing unnecessary modules..."
-      npm prune --production
-
-
-      echo "***  Restarting Mempool  ***"
-      sudo systemctl start mempool
+    echo "***  Restarting Mempool  ***"
+    sudo systemctl start mempool
 
   fi