mirror of
https://github.com/rootzoll/raspiblitz.git
synced 2025-03-01 00:59:23 +01:00
switch to dialog inputbox for zerotier (#4464)
This commit is contained in:
parent
0592776504
commit
0720b0c2a8
1 changed files with 23 additions and 13 deletions
|
@ -14,9 +14,9 @@ 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
|
||||||
|
|
Loading…
Add table
Reference in a new issue