mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-03-01 00:59:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

switch to dialog inputbox for zerotier (#4464)

Browse source
This commit is contained in:
openoms 2024-03-10 21:26:01 +00:00 • committed by GitHub
parent 0592776504
commit 0720b0c2a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
home.admin/config.scripts/bonus.zerotier.sh
View file

@ -2,21 +2,21 @@
# command info # command info
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
echo "config script to install, uninstall ZeroTier" echo "config script to install, uninstall ZeroTier"
echo "bonus.zerotier.sh on [?networkid]" echo "bonus.zerotier.sh on [?networkid]"
echo "bonus.zerotier.sh off" echo "bonus.zerotier.sh off"
echo "bonus.zerotier.sh menu" echo "bonus.zerotier.sh menu"
exit 1 exit 1
fi fi
source /mnt/hdd/raspiblitz.conf source /mnt/hdd/raspiblitz.conf
# show info menu # show info menu
if [ "$1" = "menu" ]; then if [ "$1" = "menu" ]; then
networkDetails=$(sudo zerotier-cli listnetworks | grep OK) networkDetails=$(sudo zerotier-cli listnetworks | grep OK)
whiptail --title " Info ZeroTier " --msgbox "\n\ whiptail --title " Info ZeroTier " --msgbox "\n\
Manage your ZeroTier account at https://my.zerotier.com. Add additional devices Manage your ZeroTier account at https://my.zerotier.com. Add additional devices
(desktop/laptop/mobile) to your network so they can communicate.\n\n\ (desktop/laptop/mobile) to your network so they can communicate.\n\n\
@ -40,9 +40,19 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
networkID=$2 networkID=$2
if [ ${#networkID} -eq 0 ]; then if [ ${#networkID} -eq 0 ]; then
networkID=$(whiptail --inputbox "\nPlease enter the ZeroTier networkID to connect to:" 10 38 "" --title " Join ZeroTier Network " --backtitle "RaspiBlitz - Settings" 3>&1 1>&2 2>&3) trap 'rm -f "$_temp"' EXIT
networkID=$(echo "${networkID[0]}") _temp=$(mktemp -p /dev/shm/)
if [ ${#networkID} -eq 0 ]; then
dialog --backtitle "RaspiBlitz - Settings" \
--title "Join ZeroTier Network" \
--inputbox "\nPlease enter the ZeroTier networkID to connect to:" 10 60 2>"$_temp"
networkID=$(cat "$_temp")
# Remove temporary file explicitly, though it's also handled by the EXIT trap
rm -f "$_temp"
if [ -z "$networkID" ]; then
echo "error='cancel'" echo "error='cancel'"
exit 0 exit 0
fi fi
@ -67,7 +77,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
# adding zero tier IP to LND TLS cert # adding zero tier IP to LND TLS cert
# sudo /home/admin/config.scripts/lnd.tlscert.sh ip-add 172.X # sudo /home/admin/config.scripts/lnd.tlscert.sh ip-add 172.X
# sudo /home/admin/config.scripts/lnd.credentials.sh reset "${chain:-main}net" tls # sudo /home/admin/config.scripts/lnd.credentials.sh reset "${chain:-main}net" tls
# sudo /home/admin/config.scripts/lnd.credentials.sh sync "${chain:-main}net" # sudo /home/admin/config.scripts/lnd.credentials.sh sync "${chain:-main}net"
else else
@ -94,4 +104,4 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
fi fi
echo "error='unknown parameter'" echo "error='unknown parameter'"
exit 1 exit 1