Hotspot settings
This commit is contained in:
Bob Mottram
parent
0e465fa575
commit
d02d8701de
|
|
@ -1769,9 +1769,9 @@ function setup_wifi {
|
|||
echo $'Wifi passphrase was too short'
|
||||
return
|
||||
fi
|
||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT
|
||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
|
||||
else
|
||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT
|
||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
|
||||
fi
|
||||
echo 'setup_wifi' >> $COMPLETION_FILE
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1696,6 +1696,95 @@ function wifi_settings {
|
|||
fi
|
||||
}
|
||||
|
||||
function hotspot_settings {
|
||||
data=$(tempfile 2>/dev/null)
|
||||
trap "rm -f $data" 0 1 2 5 15
|
||||
dialog --backtitle $"Freedombone Control Panel" \
|
||||
--title $"Hotspot Settings" \
|
||||
--form $"" 10 60 4 \
|
||||
$"Enabled (yes/no):" 1 1 "$WIFI_HOTSPOT" 1 24 5 5 \
|
||||
$"SSID:" 2 1 "$WIFI_SSID" 2 24 256 256 \
|
||||
$"Type (wpa2-psk/none):" 3 1 "$WIFI_TYPE" 3 24 10 10 \
|
||||
$"Passphrase:" 4 1 "$WIFI_PASSPHRASE" 4 24 256 256 \
|
||||
2> $data
|
||||
sel=$?
|
||||
case $sel in
|
||||
1) return;;
|
||||
255) return;;
|
||||
esac
|
||||
TEMP_WIFI_HOTSPOT=$(cat $data | sed -n 1p)
|
||||
TEMP_WIFI_SSID=$(cat $data | sed -n 2p)
|
||||
TEMP_WIFI_TYPE=$(cat $data | sed -n 3p)
|
||||
TEMP_WIFI_PASSPHRASE=$(cat $data | sed -n 4p)
|
||||
|
||||
if [ ${#TEMP_WIFI_SSID} -lt 2 ]; then
|
||||
return
|
||||
fi
|
||||
if [ ${#TEMP_WIFI_TYPE} -lt 2 ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
WIFI_EXTRA=''
|
||||
if [[ $TEMP_WIFI_HOTSPOT == $'yes' || $TEMP_WIFI_HOTSPOT == $'y' || $TEMP_WIFI_HOTSPOT == $'on' ]]; then
|
||||
TEMP_WIFI_HOTSPOT='yes'
|
||||
else
|
||||
TEMP_WIFI_HOTSPOT='no'
|
||||
WIFI_EXTRA='--networks $WIFI_NETWORKS_FILE'
|
||||
fi
|
||||
|
||||
if [[ $TEMP_WIFI_TYPE != $'none' ]]; then
|
||||
if [ ! $TEMP_WIFI_PASSPHRASE ]; then
|
||||
dialog --title $"Wifi Settings" \
|
||||
--msgbox $"No wifi hotspot passphrase was given" 6 40
|
||||
return
|
||||
fi
|
||||
if [ ${#TEMP_WIFI_PASSPHRASE} -lt 2 ]; then
|
||||
dialog --title $"Wifi Settings" \
|
||||
--msgbox $"Wifi hotspot passphrase was too short" 6 40
|
||||
return
|
||||
fi
|
||||
|
||||
WIFI_HOTSPOT=$TEMP_WIFI_HOTSPOT
|
||||
WIFI_SSID=$TEMP_WIFI_SSID
|
||||
WIFI_TYPE=$TEMP_WIFI_TYPE
|
||||
WIFI_PASSPHRASE=$TEMP_WIFI_PASSPHRASE
|
||||
|
||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT $WIFI_EXTRA
|
||||
else
|
||||
WIFI_HOTSPOT=$TEMP_WIFI_HOTSPOT
|
||||
WIFI_SSID=$TEMP_WIFI_SSID
|
||||
WIFI_TYPE=$TEMP_WIFI_TYPE
|
||||
WIFI_PASSPHRASE=$TEMP_WIFI_PASSPHRASE
|
||||
|
||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT $WIFI_EXTRA
|
||||
fi
|
||||
|
||||
# store any changes
|
||||
if ! grep -q "WIFI_HOTSPOT" $CONFIGURATION_FILE; then
|
||||
echo "WIFI_HOTSPOT=$WIFI_HOTSPOT" >> $CONFIGURATION_FILE
|
||||
else
|
||||
sed -i "s|WIFI_HOTSPOT=.*|WIFI_HOTSPOT=$WIFI_HOTSPOT|g" $CONFIGURATION_FILE
|
||||
fi
|
||||
if ! grep -q "WIFI_SSID" $CONFIGURATION_FILE; then
|
||||
echo "WIFI_SSID=$WIFI_SSID" >> $CONFIGURATION_FILE
|
||||
else
|
||||
sed -i "s|WIFI_SSID=.*|WIFI_SSID=$WIFI_SSID|g" $CONFIGURATION_FILE
|
||||
fi
|
||||
if ! grep -q "WIFI_TYPE" $CONFIGURATION_FILE; then
|
||||
echo "WIFI_TYPE=$WIFI_TYPE" >> $CONFIGURATION_FILE
|
||||
else
|
||||
sed -i "s|WIFI_TYPE=.*|WIFI_SSID=$WIFI_TYPE|g" $CONFIGURATION_FILE
|
||||
fi
|
||||
if ! grep -q "WIFI_PASSPHRASE" $CONFIGURATION_FILE; then
|
||||
echo "WIFI_PASSPHRASE=$WIFI_PASSPHRASE" >> $CONFIGURATION_FILE
|
||||
else
|
||||
sed -i "s|WIFI_PASSPHRASE=.*|WIFI_PASSPHRASE=$WIFI_PASSPHRASE|g" $CONFIGURATION_FILE
|
||||
fi
|
||||
|
||||
dialog --title $"Wifi Settings" \
|
||||
--msgbox $"Hotspot settings were changed" 6 40
|
||||
}
|
||||
|
||||
function menu_backup_restore {
|
||||
while true
|
||||
do
|
||||
|
|
@ -1781,18 +1870,18 @@ function menu_users {
|
|||
case $sel in
|
||||
1) break;;
|
||||
255) break;;
|
||||
esac
|
||||
case $(cat $data) in
|
||||
esac
|
||||
case $(cat $data) in
|
||||
1) add_user;;
|
||||
2) delete_user;;
|
||||
3) change_password;;
|
||||
4) change_ssh_public_key;;
|
||||
5) break;;
|
||||
esac
|
||||
done
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
function menu_hubzilla {
|
||||
function menu_hubzilla {
|
||||
while true
|
||||
do
|
||||
data=$(tempfile 2>/dev/null)
|
||||
|
|
@ -1814,9 +1903,9 @@ function menu_hubzilla {
|
|||
3) break;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
function menu_media {
|
||||
function menu_media {
|
||||
while true
|
||||
do
|
||||
data=$(tempfile 2>/dev/null)
|
||||
|
|
@ -1839,13 +1928,9 @@ function menu_media {
|
|||
3) break;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
function hotspot_settings {
|
||||
# TODO
|
||||
}
|
||||
|
||||
function menu_wifi {
|
||||
function menu_wifi {
|
||||
hotspot_state=$'off'
|
||||
if [ -f /etc/hostapd/hostapd.conf ]; then
|
||||
hotspot_state=$'on'
|
||||
|
|
@ -1874,9 +1959,9 @@ function menu_wifi {
|
|||
4) break;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
function menu_irc {
|
||||
function menu_irc {
|
||||
if [ ! -d /etc/ngircd ]; then
|
||||
dialog --title $"IRC Menu" \
|
||||
--msgbox $"No IRC server is installed" 6 70
|
||||
|
|
@ -1904,9 +1989,9 @@ function menu_irc {
|
|||
3) break;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
function menu_top_level {
|
||||
function menu_top_level {
|
||||
while true
|
||||
do
|
||||
data=$(tempfile 2>/dev/null)
|
||||
|
|
@ -1966,22 +2051,22 @@ function menu_top_level {
|
|||
22) break;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
if [[ $USER != 'root' ]]; then
|
||||
if [[ $USER != 'root' ]]; then
|
||||
# show the user version of the control panel
|
||||
freedombone-controlpanel-user
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -f $COMPLETION_FILE ]; then
|
||||
if [ ! -f $COMPLETION_FILE ]; then
|
||||
echo $'This command should only be run on an installed Freedombone system'
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
ADMIN_USER=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
|
||||
read_repo_servers
|
||||
menu_top_level
|
||||
clear
|
||||
cat /etc/motd
|
||||
exit 0
|
||||
ADMIN_USER=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
|
||||
read_repo_servers
|
||||
menu_top_level
|
||||
clear
|
||||
cat /etc/motd
|
||||
exit 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue