#2759 update pyblock install (#2811)

home.admin/99updateMenu.sh

@@ -476,10 +476,6 @@ if [ "${sphinxrelay}" == "on" ]; then
   OPTIONS+=(SPHINX "Update Sphinx Server Relay")
 fi
 
-if [ "${pyblock}" == "on" ]; then
-  OPTIONS+=(PYBLOCK "Update PyBLOCK")
-fi
-
 if [ "${mempoolExplorer}" == "on" ]; then
   OPTIONS+=(MEMPOOL "Update Mempool Explorer")
 fi
@@ -531,9 +527,6 @@ case $CHOICE in
   SPHINX)
     /home/admin/config.scripts/bonus.sphinxrelay.sh update
     ;;
-  PYBLOCK)
-    /home/admin/config.scripts/bonus.pyblock.sh update
-    ;;
   TOR)
     sudo /home/admin/config.scripts/tor.network.sh update
     ;;

home.admin/_commands.sh

@@ -241,11 +241,8 @@ function bos() {
 # switch to the pyblock user for PyBLOCK
 function pyblock() {
   if [ $(grep -c "pyblock=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then
-    echo "# switching to the pyblock user with the command: 'sudo su - pyblock'"
-    echo "# use command 'exit' and then 'raspiblitz' to return to menu"
-    echo "# use command 'pyblock' again to start"
-    sudo su - pyblock
-    echo "# use command 'raspiblitz' to return to menu"
+    cd /home/pyblock
+    sudo -u pyblock /home/pyblock/.local/bin/pyblock
   else
     echo "PyBlock is not installed - to install run:"
     echo "/home/admin/config.scripts/bonus.pyblock.sh on"

home.admin/config.scripts/bonus.pyblock.sh

@@ -31,13 +31,14 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   
   # create pyblock user
   sudo adduser --disabled-password --gecos "" pyblock
+  cd /home/pyblock
+  sudo -u pyblock mkdir /home/pyblock/config
 
-  
-  # download source code
-  sudo -u pyblock git clone https://github.com/curly60e/pyblock.git /home/pyblock/PyBLOCK
-  cd /home/pyblock/PyBLOCK
-  sudo -u pyblock pip3 install -r requirements.txt
-  sudo apt-get install hexyl
+  # install hexyl
+  sudo apt-get install hexyl html2text
+
+  # install via pip
+  sudo -u pyblock pip3 install pybitblock 
 
   # set PATH for the user
   sudo bash -c "echo 'PATH=\$PATH:/home/pyblock/.local/bin/' >> /home/pyblock/.profile"
@@ -58,24 +59,18 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   ## Create conf
   # from xxd -p bclock.conf | tr -d '\n'
   echo 80037d710028580700000069705f706f727471015807000000687474703a2f2f710258070000007270637573657271035800000000710458070000007270637061737371056804580a000000626974636f696e636c697106581a0000002f7573722f6c6f63616c2f62696e2f626974636f696e2d636c697107752e0a | xxd -r -p -  ~/bclock.conf
-  sudo mv ~/bclock.conf /home/pyblock/bclock.conf
-  sudo chown pyblock:pyblock /home/pyblock/bclock.conf
+  sudo mv ~/bclock.conf /home/pyblock/config/bclock.conf
+  sudo chown pyblock:pyblock /home/pyblock/config/bclock.conf
 
   # from xxd -p blndconnect.conf | tr -d '\n'
   echo 80037d710028580700000069705f706f72747101580000000071025803000000746c737103680258080000006d616361726f6f6e7104680258020000006c6e710558140000002f7573722f6c6f63616c2f62696e2f6c6e636c697106752e0a | xxd -r -p -  ~/blndconnect.conf
-  sudo mv ~/blndconnect.conf /home/pyblock/blndconnect.conf
-  sudo chown pyblock:pyblock /home/pyblock/blndconnect.conf
+  sudo mv ~/blndconnect.conf /home/pyblock/config/blndconnect.conf
+  sudo chown pyblock:pyblock /home/pyblock/config/blndconnect.conf
 
   # setting value in raspi blitz config
   /home/admin/config.scripts/blitz.conf.sh set pyblock "on"
-  
-  ## pyblock short command
-  sudo bash -c "echo 'alias pyblock=\"cd ~; python3 ~/PyBLOCK/PyBlock.py\"' >> /home/pyblock/.bashrc"
-  
-  echo "# Usage: https://github.com/curly60e/pyblock/blob/master/README.md"
-  echo "# To start type: 'sudo su pyblock' in the command line."
-  echo "# Then pyblock"
-  echo "# To exit the user - type 'exit' and press ENTER"
+  echo "# Usage: https://github.com/curly60e/pyblock"
+  echo "# To start use raspiblitz shortcut-command: pyblock"
 
   exit 0
 fi
@@ -93,15 +88,5 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
 
 fi
 
-# update
-if [ "$1" = "update" ]; then
-  echo "*** UPDATING PyBLOCK ***"
-  cd /home/pyblock/PyBLOCK
-  sudo -u pyblock git pull
-  sudo -u pyblock pip3 install -r requirements.txt
-  echo "*** Updated to the latest in https://github.com/curly60e/pyblock ***"
-  exit 0
-fi
-
 echo "FAIL - Unknown Parameter $1"
 exit 1