From fbf6db75ab667bc03884a9dc85a23d3f343b477b Mon Sep 17 00:00:00 2001 From: openoms <43343391+openoms@users.noreply.github.com> Date: Sun, 13 Feb 2022 12:23:34 +0000 Subject: [PATCH] run blitz.display.sh with sudo (#2957) --- home.admin/97addMobileWallet.sh | 62 +++++++++--------- home.admin/BBcreateInvoice.sh | 8 +-- home.admin/BBfundWallet.sh | 4 +- home.admin/config.scripts/blitz.display.sh | 63 ++++++++++--------- .../config.scripts/bonus.btc-rpc-explorer.sh | 4 +- .../config.scripts/bonus.btcpayserver.sh | 4 +- home.admin/config.scripts/bonus.electrs.sh | 4 +- home.admin/config.scripts/bonus.fullynoded.sh | 4 +- .../config.scripts/bonus.joinmarket-webui.sh | 4 +- home.admin/config.scripts/bonus.lit.sh | 4 +- home.admin/config.scripts/bonus.lnbits.sh | 4 +- home.admin/config.scripts/bonus.lndconnect.sh | 4 +- home.admin/config.scripts/bonus.mempool.sh | 4 +- home.admin/config.scripts/bonus.rtl.sh | 4 +- home.admin/config.scripts/bonus.specter.sh | 4 +- .../config.scripts/bonus.sphinxrelay.sh | 4 +- .../config.scripts/bonus.tallycoin-connect.sh | 4 +- home.admin/config.scripts/bonus.thunderhub.sh | 4 +- home.admin/config.scripts/cl-plugin.http.sh | 8 +-- home.admin/config.scripts/cl-plugin.sparko.sh | 14 ++--- home.admin/config.scripts/cl.rest.sh | 10 +-- home.admin/config.scripts/cl.spark.sh | 4 +- 22 files changed, 115 insertions(+), 114 deletions(-) diff --git a/home.admin/97addMobileWallet.sh b/home.admin/97addMobileWallet.sh index fa6d2cc0f..e8c42b207 100755 --- a/home.admin/97addMobileWallet.sh +++ b/home.admin/97addMobileWallet.sh @@ -167,7 +167,7 @@ fi CHOICE=$(whiptail --clear --title "Choose Mobile Wallet" --menu "" 18 75 12 "${OPTIONS[@]}" 2>&1 >/dev/tty) -/home/admin/config.scripts/blitz.display.sh hide +sudo /home/admin/config.scripts/blitz.display.sh hide clear echo "creating install info ..." @@ -195,39 +195,39 @@ case $CHOICE in ;; ZAP_IOS) appstoreLink="https://apps.apple.com/us/app/zap-bitcoin-lightning-wallet/id1406311960" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zap.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zap.png whiptail --title "Install Fully Noded on your iOS device" \ --yes-button "Continue" \ --no-button "StoreLink" \ --yesno "Open the Apple App Store on your mobile phone.\n\nSearch for --> 'Zap Bitcoin'\n\nCheck that logo is like on LCD & author: Zap Technologies LLC\nWhen app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " App Store Link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the qr code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/bonus.lndconnect.sh zap-ios tor exit 0; ;; ZAP_ANDROID) appstoreLink="https://play.google.com/store/apps/details?id=zapsolutions.zap" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zap.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zap.png whiptail --title "Install Zap on your Android Phone" \ --yes-button "Continue" \ --no-button "StoreLink" \ --yesno "Open the Android Play Store on your mobile phone.\n\nSearch for --> 'zap bitcoin app'\n\nCheck that logo is like on LCD and author is: Zap\nWhen app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " App Store Link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the qr code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/bonus.lndconnect.sh zap-android tor exit 0; ;; @@ -250,85 +250,85 @@ Please go to MAINMENU > SERVICES and activate KEYSEND first. --no-button "Link as QR code" \ --yesno "Download & install the SendMany APK (armeabi-v7) from GitHub:\n\n${appstoreLink}\n\nEasiest way to scan QR code on LCD and download/install.\n\nWhen installed and started -> continue." 13 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} /home/admin/config.scripts/blitz.display.sh qr-console ${appstoreLink} fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide checkIP2TOR LND-GRPC-API /home/admin/config.scripts/bonus.lndconnect.sh sendmany-android ${connect} exit 0; ;; ZEUS_IOS) appstoreLink="https://apps.apple.com/us/app/zeus-ln/id1456038895" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png whiptail --title "Install Zeus on your iOS device" \ --yes-button "Continue" \ --no-button "Link as QRcode" \ --yesno "Open the Apple App Store on your mobile phone.\n\nSearch for --> 'zeus ln'\n\nCheck that logo is like on LCD and author is: Zeus LN LLC\nWhen the app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} /home/admin/config.scripts/blitz.display.sh qr-console ${appstoreLink} fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/bonus.lndconnect.sh zeus-ios tor exit 0; ;; ZEUS_ANDROID) appstoreLink="https://play.google.com/store/apps/details?id=app.zeusln.zeus" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png whiptail --title "Install Zeus on your Android Phone" \ --yes-button "Continue" \ --no-button "StoreLink" \ --yesno "Open the Android Play Store on your mobile phone.\n\nSearch for --> 'zeus ln'\n\nCheck that logo is like on LCD and author is: Evan Kaloudis\nWhen app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " App Store Link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the qr code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/bonus.lndconnect.sh zeus-android tor exit 0; ;; FULLYNODED_BTC) appstoreLink="https://apps.apple.com/us/app/fully-noded/id1436425586" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_fullynoded.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_fullynoded.png whiptail --title "Install Fully Noded on your iOS device" \ --yes-button "Continue" \ --no-button "StoreLink" \ --yesno "Open the Apple App Store on your mobile phone.\n\nSearch for --> 'fully noded'\n\nCheck that logo is like on LCD and author is: Denton LLC\nWhen app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " App Store Link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the qr code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/bonus.fullynoded.sh exit 0; ;; FULLYNODED_LND) appstoreLink="https://apps.apple.com/us/app/fully-noded/id1436425586" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_fullynoded.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_fullynoded.png whiptail --title "Install Fully Noded on your iOS device" \ --yes-button "Continue" \ --no-button "StoreLink" \ --yesno "Open the Apple App Store on your mobile phone.\n\nSearch for --> 'fully noded'\n\nCheck that logo is like on LCD and author is: Denton LLC\nWhen app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " App Store Link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the qr code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/bonus.lndconnect.sh fullynoded-lnd tor exit 0; ;; @@ -338,26 +338,26 @@ Or scan the qr code on the LCD with your mobile phone. /home/admin/config.scripts/cl-plugin.http.sh on fi appstoreLink="https://apps.apple.com/us/app/fully-noded/id1436425586" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_fullynoded.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_fullynoded.png whiptail --title "Install Fully Noded on your iOS device" \ --yes-button "Continue" \ --no-button "StoreLink" \ --yesno "Open the Apple App Store on your mobile phone.\n\nSearch for --> 'fully noded'\n\nCheck that logo is like on LCD and author is: Denton LLC\nWhen app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " App Store Link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the qr code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/cl-plugin.http.sh connect exit 0; ;; ZEUS_CLREST) - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png whiptail --title "Install Zeus on your Android or iOS Phone" \ --yes-button "Continue" \ --no-button "Cancel" \ @@ -365,12 +365,12 @@ ZEUS_CLREST) if [ $? -eq 1 ]; then exit 0 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/cl.rest.sh connect exit 0; ;; ZEUS_SPARK) - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png whiptail --title "Install Zeus on your Android or iOS Phone" \ --yes-button "Continue" \ --no-button "Cancel" \ @@ -378,26 +378,26 @@ ZEUS_SPARK) if [ $? -eq 1 ]; then exit 0 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/cl-plugin.sparko.sh connect exit 0; ;; SPARK) appstoreLink="https://github.com/shesek/spark-wallet#mobile-app" - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/app_zeus.png whiptail --title "Install Zeus on your Android Phone" \ --yes-button "Continue" \ --no-button "GitHub link" \ --yesno "Open the ${appstoreLink} on Android to find the App Store link or binary for your phone.\n\nWhen the app is installed and started --> Continue." 12 65 if [ $? -eq 1 ]; then - /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} + sudo /home/admin/config.scripts/blitz.display.sh qr ${appstoreLink} whiptail --title " GitHub link " --msgbox "\ To install app open the following link:\n ${appstoreLink}\n Or scan the QR code on the LCD with your mobile phone. " 11 70 fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide /home/admin/config.scripts/cl-plugin.sparko.sh connect exit 0; ;; diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh index 3a9e8236b..e9e7928d9 100755 --- a/home.admin/BBcreateInvoice.sh +++ b/home.admin/BBcreateInvoice.sh @@ -120,7 +120,7 @@ else rhash=$(echo "$result" | grep r_hash | cut -d '"' -f4) payReq=$(echo "$result" | grep payment_request | cut -d '"' -f4) fi - /home/admin/config.scripts/blitz.display.sh qr "${payReq}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${payReq}" if [ $(sudo dpkg-query -l | grep "ii qrencode" | wc -l) = 0 ]; then sudo apt-get install qrencode -y > /dev/null @@ -162,8 +162,8 @@ else echo $result echo echo "OK the Invoice was paid - returning to menu." - /home/admin/config.scripts/blitz.display.sh hide - /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/ok.png + sudo /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh image /home/admin/raspiblitz/pictures/ok.png sleep 2 break fi @@ -182,7 +182,7 @@ else done - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide fi echo "Press ENTER to return to main menu." diff --git a/home.admin/BBfundWallet.sh b/home.admin/BBfundWallet.sh index 97e713426..d487a2c64 100755 --- a/home.admin/BBfundWallet.sh +++ b/home.admin/BBfundWallet.sh @@ -79,7 +79,7 @@ if [ "$chain" = "test" ]; then fi echo "generating QR code ... please wait" -/home/admin/config.scripts/blitz.display.sh qr "$network:${address}" +sudo /home/admin/config.scripts/blitz.display.sh qr "$network:${address}" # raise high focus on onchain wallet balance & pending for the next 15min /home/admin/_cache.sh focus ln_${LNTYPE}_${chain}net_wallet_onchain_pending 0 900 @@ -98,7 +98,7 @@ if [ $? -eq 1 ]; then fi # clean up -/home/admin/config.scripts/blitz.display.sh hide +sudo /home/admin/config.scripts/blitz.display.sh hide # follow up info if [ $LNTYPE = cl ];then diff --git a/home.admin/config.scripts/blitz.display.sh b/home.admin/config.scripts/blitz.display.sh index 1c07d86c8..16bcf7899 100755 --- a/home.admin/config.scripts/blitz.display.sh +++ b/home.admin/config.scripts/blitz.display.sh @@ -4,6 +4,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo "# make changes to the LCD screen" echo + echo "# all commands need to run as root or with sudo" echo "# blitz.display.sh image [path]" echo "# blitz.display.sh qr [datastring]" echo "# blitz.display.sh qr-console [datastring]" @@ -27,6 +28,37 @@ source /mnt/hdd/raspiblitz.conf 2>/dev/null # but basically this just says if the driver for GPIO LCD is installed - not if connected fb1Exists=$(ls /dev/fb1 2>/dev/null | grep -c "/dev/fb1") +################### +# QR CODE KONSOLE +# fallback if no LCD is available +################### + +if [ "${command}" == "qr-console" ]; then + + datastring=$2 + if [ ${#datastring} -eq 0 ]; then + echo "error='missing second parameter - see help'" + exit 1 + fi + + whiptail --title "Get ready" --backtitle "QR-Code in Terminal Window" --msgbox "Make this terminal window as large as possible - fullscreen would be best. \n\nThe QR-Code might be too large for your display. In that case, shrink the letters by pressing the keys Ctrl and Minus (or Cmd and Minus if you are on a Mac) \n\nPRESS ENTER when you are ready to see the QR-code." 15 60 + + clear + qrencode -t ANSI256 ${datastring} + echo "(To shrink QR code: macOS press CMD- / LINUX press CTRL-) Press ENTER when finished." + read key + + clear + exit 0 +fi + +########################################################################### +# All below here - needs to be run as root user or called with sudo +if [ "$EUID" -ne 0 ]; then + echo "error='run as root'" + exit 1 +fi + ################### # IMAGE ################### @@ -82,30 +114,6 @@ if [ "${command}" == "qr" ]; then exit 0 fi -################### -# QR CODE KONSOLE -# fallback if no LCD is available -################### - -if [ "${command}" == "qr-console" ]; then - - datastring=$2 - if [ ${#datastring} -eq 0 ]; then - echo "error='missing second parameter - see help'" - exit 1 - fi - - whiptail --title "Get ready" --backtitle "QR-Code in Terminal Window" --msgbox "Make this terminal window as large as possible - fullscreen would be best. \n\nThe QR-Code might be too large for your display. In that case, shrink the letters by pressing the keys Ctrl and Minus (or Cmd and Minus if you are on a Mac) \n\nPRESS ENTER when you are ready to see the QR-code." 15 60 - - clear - qrencode -t ANSI256 ${datastring} - echo "(To shrink QR code: macOS press CMD- / LINUX press CTRL-) Press ENTER when finished." - read key - - clear - exit 0 -fi - ################### # HIDE ################### @@ -116,13 +124,6 @@ if [ "${command}" == "hide" ]; then exit 0 fi -########################################################################### -# All below here - needs to be run as root user or called with sudo -if [ "$EUID" -ne 0 ]; then - echo "error='run as root'" - exit 1 -fi - ################## # ROTATE # see issue: https://github.com/rootzoll/raspiblitz/issues/681 diff --git a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh index 0c6189e09..1e86bef01 100755 --- a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh +++ b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh @@ -54,7 +54,7 @@ This can take multiple hours. if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # TOR - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " BTC-RPC-Explorer " --msgbox "Open in your local web browser: http://${localip}:3020\n https://${localip}:3021 with Fingerprint: @@ -63,7 +63,7 @@ ${passwordInfo}\n Hidden Service address for TOR Browser (QR see LCD): ${toraddress} " 16 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # IP + Domain diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh index 37f33ca27..0d8bd1edb 100755 --- a/home.admin/config.scripts/bonus.btcpayserver.sh +++ b/home.admin/config.scripts/bonus.btcpayserver.sh @@ -131,7 +131,7 @@ port forwarding on router needs to be active & may change port" SHA1 ${sslFingerprintIP}" if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" text="${text}\n TOR Browser Hidden Service address (see the QR onLCD): ${toraddress}" @@ -158,7 +158,7 @@ MAINMENU > CONNECT > BTCPay Server" whiptail --title " BTCPay Server " --msgbox "${text}" 17 69 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide echo "# please wait ..." exit 0 fi diff --git a/home.admin/config.scripts/bonus.electrs.sh b/home.admin/config.scripts/bonus.electrs.sh index 78daeb46e..58669d17e 100755 --- a/home.admin/config.scripts/bonus.electrs.sh +++ b/home.admin/config.scripts/bonus.electrs.sh @@ -211,7 +211,7 @@ Check 'sudo nginx -t' for a detailed error message. echo echo "To connect through TOR open the Tor Browser and start with the options:" echo "electrum --oneserver --server ${TORaddress}:50002:s --proxy socks5:127.0.0.1:9150" - /home/admin/config.scripts/blitz.display.sh qr "${TORaddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${TORaddress}" fi echo echo "For more details check the RaspiBlitz README on ElectRS:" @@ -219,7 +219,7 @@ Check 'sudo nginx -t' for a detailed error message. echo echo "Press ENTER to get back to main menu." read key - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide ;; STATUS) sudo /home/admin/config.scripts/bonus.electrs.sh status diff --git a/home.admin/config.scripts/bonus.fullynoded.sh b/home.admin/config.scripts/bonus.fullynoded.sh index fcfa1b2af..2ed70f703 100755 --- a/home.admin/config.scripts/bonus.fullynoded.sh +++ b/home.admin/config.scripts/bonus.fullynoded.sh @@ -37,11 +37,11 @@ echo "${hiddenService}" quickConnect="btcstandup://${RPC_USER}:${PASSWORD_B}@${hiddenService}:${BITCOINRPCPORT}/?label=${hostname}" echo echo "scan the QR Code with Fully Noded to connect to your node:" -/home/admin/config.scripts/blitz.display.sh qr "${quickConnect}" +sudo /home/admin/config.scripts/blitz.display.sh qr "${quickConnect}" qrencode -t ANSI256 $quickConnect echo "Press ENTER to return to the menu" read key # clean up -/home/admin/config.scripts/blitz.display.sh hide +sudo /home/admin/config.scripts/blitz.display.sh hide clear \ No newline at end of file diff --git a/home.admin/config.scripts/bonus.joinmarket-webui.sh b/home.admin/config.scripts/bonus.joinmarket-webui.sh index 466a29738..67609e60d 100755 --- a/home.admin/config.scripts/bonus.joinmarket-webui.sh +++ b/home.admin/config.scripts/bonus.joinmarket-webui.sh @@ -32,14 +32,14 @@ if [ "$1" = "menu" ]; then if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # Info with TOR - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " JoinMarket Web UI " --msgbox "Open in your local web browser: http://${localip}:7500\n https://${localip}:7501 with Fingerprint: ${fingerprint}\n Hidden Service address for TOR Browser (see LCD for QR):\n${toraddress} " 16 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # Info without TOR whiptail --title " JoinMarket Web UI " --msgbox "Open in your local web browser & accept self-signed cert: diff --git a/home.admin/config.scripts/bonus.lit.sh b/home.admin/config.scripts/bonus.lit.sh index c63378780..8c648de51 100644 --- a/home.admin/config.scripts/bonus.lit.sh +++ b/home.admin/config.scripts/bonus.lit.sh @@ -34,7 +34,7 @@ if [ "$1" = "menu" ]; then if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # Info with TOR - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " Lightning Terminal " --msgbox "Open in your local web browser & accept self-signed cert: https://${localip}:8443\n SHA1 Thumb/Fingerprint: @@ -45,7 +45,7 @@ https://${toraddress}\n For the command line switch to 'lit' user with: 'sudo su - lit' use the commands: 'lncli', 'lit-loop', 'lit-pool' and 'lit-frcli'. " 19 74 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # Info without TOR whiptail --title " Lightning Terminal " --msgbox "Open in your local web browser & accept self-signed cert: diff --git a/home.admin/config.scripts/bonus.lnbits.sh b/home.admin/config.scripts/bonus.lnbits.sh index 81656aeff..9e6b0f776 100755 --- a/home.admin/config.scripts/bonus.lnbits.sh +++ b/home.admin/config.scripts/bonus.lnbits.sh @@ -57,7 +57,7 @@ You need to accept self-signed HTTPS cert with SHA1 Fingerprint: ${sslFingerprintIP}" if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" text="${text}\n TOR Browser Hidden Service address (QR see LCD): ${toraddress}" @@ -81,7 +81,7 @@ Consider adding a IP2TOR Bridge under OPTIONS." whiptail --title " LNbits ${fundinginfo}" --yes-button "OK" --no-button "OPTIONS" --yesno "${text}" 18 69 result=$? - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide echo "option (${result}) - please wait ..." # exit when user presses OK to close menu diff --git a/home.admin/config.scripts/bonus.lndconnect.sh b/home.admin/config.scripts/bonus.lndconnect.sh index a7255e8a1..a305c191c 100755 --- a/home.admin/config.scripts/bonus.lndconnect.sh +++ b/home.admin/config.scripts/bonus.lndconnect.sh @@ -202,7 +202,7 @@ fi lndconnect="lndconnect://${host}:${port}${macaroonParameter}${certParameter}" # display qr code image on LCD -/home/admin/config.scripts/blitz.display.sh qr "${lndconnect}" +sudo /home/admin/config.scripts/blitz.display.sh qr "${lndconnect}" # show pairing info dialog msg="" @@ -229,7 +229,7 @@ if [ $? -eq 1 ]; then fi # clean up -/home/admin/config.scripts/blitz.display.sh hide +sudo /home/admin/config.scripts/blitz.display.sh hide echo "------------------------------" echo "If the connection was not working:" diff --git a/home.admin/config.scripts/bonus.mempool.sh b/home.admin/config.scripts/bonus.mempool.sh index 21b5a2ffb..acb50bbc4 100755 --- a/home.admin/config.scripts/bonus.mempool.sh +++ b/home.admin/config.scripts/bonus.mempool.sh @@ -43,7 +43,7 @@ This can take multiple hours. if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # Tor - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " Mempool " --msgbox "Open in your local web browser: http://${localip}:4080\n https://${localip}:4081 with Fingerprint: @@ -51,7 +51,7 @@ ${fingerprint}\n Hidden Service address for Tor Browser (QR see LCD): ${toraddress} " 16 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # IP + Domain diff --git a/home.admin/config.scripts/bonus.rtl.sh b/home.admin/config.scripts/bonus.rtl.sh index eaf722d41..a21d9808f 100755 --- a/home.admin/config.scripts/bonus.rtl.sh +++ b/home.admin/config.scripts/bonus.rtl.sh @@ -66,7 +66,7 @@ if [ "$1" = "menu" ]; then # info with Tor if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title "Ride The Lightning (RTL - $LNTYPE - $CHAIN)" --msgbox "Open in your local web browser: http://${localip}:${RTLHTTP}\n https://${localip}:$((RTLHTTP+1)) with Fingerprint: @@ -74,7 +74,7 @@ ${fingerprint}\n Use your Password B to login.\n Hidden Service address for Tor Browser (QRcode on LCD):\n${toraddress} " 16 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide # info without Tor else diff --git a/home.admin/config.scripts/bonus.specter.sh b/home.admin/config.scripts/bonus.specter.sh index cade48474..8aa604772 100755 --- a/home.admin/config.scripts/bonus.specter.sh +++ b/home.admin/config.scripts/bonus.specter.sh @@ -59,7 +59,7 @@ if [ "$1" = "menu" ]; then if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # Tor - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " Specter Desktop " --msgbox "Open in your local web browser & accept self-signed cert: https://${localip}:25441 @@ -72,7 +72,7 @@ Hidden Service address for TOR Browser (QR see LCD): https://${toraddress} Unfortunately the camera is currently not usable via Tor, though. " 18 74 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # IP + Domain diff --git a/home.admin/config.scripts/bonus.sphinxrelay.sh b/home.admin/config.scripts/bonus.sphinxrelay.sh index 1b2b13414..033763759 100755 --- a/home.admin/config.scripts/bonus.sphinxrelay.sh +++ b/home.admin/config.scripts/bonus.sphinxrelay.sh @@ -163,7 +163,7 @@ ${publicURL}" fi # show qr code on LCD & console - /home/admin/config.scripts/blitz.display.sh qr "${connectionCode}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${connectionCode}" whiptail --title " Connect App with Sphinx Relay " \ --yes-button "Done" \ --no-button "Show QR Code" \ @@ -179,7 +179,7 @@ ${extraPairInfo}" 17 76 read key fi - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide exit 0 fi diff --git a/home.admin/config.scripts/bonus.tallycoin-connect.sh b/home.admin/config.scripts/bonus.tallycoin-connect.sh index c73103091..36e43bf40 100755 --- a/home.admin/config.scripts/bonus.tallycoin-connect.sh +++ b/home.admin/config.scripts/bonus.tallycoin-connect.sh @@ -30,7 +30,7 @@ if [ "$1" = "menu" ]; then if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # Info with TOR - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " Tallycoin Connect " --msgbox "Open in your local web browser: http://${localip}:8123\n https://${localip}:8124 with Fingerprint: @@ -38,7 +38,7 @@ ${fingerprint}\n Use your Password B to login.\n Hidden Service address for TOR Browser (see LCD for QR):\n${toraddress} " 16 72 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # Info without TOR whiptail --title " Tallycoin Connect " --msgbox "Open in your local web browser & accept self-signed cert: diff --git a/home.admin/config.scripts/bonus.thunderhub.sh b/home.admin/config.scripts/bonus.thunderhub.sh index a149dbcc3..fcdb11469 100755 --- a/home.admin/config.scripts/bonus.thunderhub.sh +++ b/home.admin/config.scripts/bonus.thunderhub.sh @@ -30,7 +30,7 @@ if [ "$1" = "menu" ]; then if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then # Info with TOR - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" whiptail --title " ThunderHub " --msgbox "Open in your local web browser: http://${localip}:3010\n https://${localip}:3011 with Fingerprint: @@ -38,7 +38,7 @@ ${fingerprint}\n Use your Password B to login.\n Hidden Service address for TOR Browser (see LCD for QR):\n${toraddress} " 16 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide else # Info without TOR whiptail --title " ThunderHub " --msgbox "Open in your local web browser: diff --git a/home.admin/config.scripts/cl-plugin.http.sh b/home.admin/config.scripts/cl-plugin.http.sh index 5c922c5e0..d233f8cde 100644 --- a/home.admin/config.scripts/cl-plugin.http.sh +++ b/home.admin/config.scripts/cl-plugin.http.sh @@ -30,7 +30,7 @@ if [ $1 = connect ];then url="http://lightning:${PASSWORD_B}@${toraddress}:9080" clear echo - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" echo " Connect Fully Noded @@ -58,8 +58,8 @@ https://github.com/Fonta1n3/FullyNoded/blob/master/Docs/Lightning.md#connect-ful echo echo "# Press enter to continue to show the full connection URL with all the info above" read key - /home/admin/config.scripts/blitz.display.sh hide - /home/admin/config.scripts/blitz.display.sh qr "${url}" + sudo /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh qr "${url}" clear echo " C-lightning connection URL code for Fully Noded: @@ -70,7 +70,7 @@ $url echo echo "# Press enter to hide the QRcode from the LCD" read key - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide exit 0 fi diff --git a/home.admin/config.scripts/cl-plugin.sparko.sh b/home.admin/config.scripts/cl-plugin.sparko.sh index c1f9ccd53..c0062e5e3 100644 --- a/home.admin/config.scripts/cl-plugin.sparko.sh +++ b/home.admin/config.scripts/cl-plugin.sparko.sh @@ -30,7 +30,7 @@ if [ "$1" = "menu" ]; then if [ ${#toraddress} -eq 0 ];then toraddresstext="Activate Tor to access the web interface from outside of the local network." else - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" fi fingerprint=$(openssl x509 -in /home/bitcoin/.lightning/sparko-tls/cert.pem -fingerprint -noout | cut -d"=" -f2) @@ -44,7 +44,7 @@ ${fingerprint}\n ${toraddresstext} " 17 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide echo "# please wait ..." exit 0 @@ -56,14 +56,14 @@ if [ $1 = connect ];then accesskey=$(sudo cat ${CLCONF} | grep "^sparko-keys=" | cut -d= -f2 | cut -d';' -f1) url="https://${localip}:${portprefix}9000/" #string="${url}?access-key=${accesskey}" - #/home/admin/config.scripts/blitz.display.sh qr "$string" + #sudo /home/admin/config.scripts/blitz.display.sh qr "$string" #clear #echo "connection string (shown as a QRcode on the top and on the LCD):" #echo "$string" #qrencode -t ANSIUTF8 "${string}" clear echo - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" echo "The Tor address is shown as a QRcode below and on the LCD" echo "Scan it to your phone with a QR scanner app and paste it to: 'Host'" echo @@ -77,8 +77,8 @@ if [ $1 = connect ];then echo echo "# Press enter to continue to show the access key" read key - /home/admin/config.scripts/blitz.display.sh hide - /home/admin/config.scripts/blitz.display.sh qr "${accesskey}" + sudo /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh qr "${accesskey}" clear echo echo "The Access Key is shown as a QRcode below and on the LCD" @@ -90,7 +90,7 @@ if [ $1 = connect ];then echo echo "# Press enter to hide the QRcode from the LCD" read key - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide exit 0 fi diff --git a/home.admin/config.scripts/cl.rest.sh b/home.admin/config.scripts/cl.rest.sh index eb460ef25..7a31bec7f 100644 --- a/home.admin/config.scripts/cl.rest.sh +++ b/home.admin/config.scripts/cl.rest.sh @@ -32,14 +32,14 @@ if [ "$1" = connect ];then hex_macaroon=$(xxd -plain /home/bitcoin/c-lightning-REST/certs/access.macaroon | tr -d '\n') url="https://${localip}:${portprefix}6100/" #string="${url}?${hex_macaroon}" - #/home/admin/config.scripts/blitz.display.sh qr "$string" + #sudo /home/admin/config.scripts/blitz.display.sh qr "$string" #clear #echo "connection string (shown as a QRcode on the top and on the LCD):" #echo "$string" #qrencode -t ANSIUTF8 "${string}" clear echo - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" echo "The Tor address is shown as a QRcode below and on the LCD" echo "Scan it to your phone with a QR scanner app and paste it to: 'Host'" echo @@ -55,8 +55,8 @@ if [ "$1" = connect ];then echo echo "# Press enter to continue to show the Macaroon" read key - /home/admin/config.scripts/blitz.display.sh hide - /home/admin/config.scripts/blitz.display.sh qr "${hex_macaroon}" + sudo /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh qr "${hex_macaroon}" clear echo echo "The Macaroon is shown as a QRcode below and on the LCD" @@ -68,7 +68,7 @@ if [ "$1" = connect ];then echo echo "# Press enter to hide the QRcode from the LCD" read key - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide exit 0 fi diff --git a/home.admin/config.scripts/cl.spark.sh b/home.admin/config.scripts/cl.spark.sh index 297021449..142f03290 100644 --- a/home.admin/config.scripts/cl.spark.sh +++ b/home.admin/config.scripts/cl.spark.sh @@ -28,7 +28,7 @@ if [ "$1" = "menu" ]; then if [ ${#toraddress} -eq 0 ];then toraddresstext="Activate Tor to access the web interface from outside of the local network." else - /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" + sudo /home/admin/config.scripts/blitz.display.sh qr "${toraddress}" fi fingerprint=$(openssl x509 -in /home/bitcoin/.spark-wallet/tls/cert.pem -fingerprint -noout | cut -d"=" -f2) @@ -42,7 +42,7 @@ ${fingerprint}\n ${toraddresstext} " 17 67 - /home/admin/config.scripts/blitz.display.sh hide + sudo /home/admin/config.scripts/blitz.display.sh hide echo "# please wait ..." exit 0