mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
rename ESSID to SSID
This commit is contained in:
parent
f6aabce3be
commit
264259aa04
1 changed files with 16 additions and 14 deletions
|
@ -15,8 +15,8 @@ essid_scan() {
|
||||||
# scan the area
|
# scan the area
|
||||||
iwctl station "${INTERFACE}" scan
|
iwctl station "${INTERFACE}" scan
|
||||||
# only show lines with signal '*'
|
# only show lines with signal '*'
|
||||||
# kill spaces from the end
|
# kill spaces from the end and replace spaces with # between
|
||||||
for dev in $(iwctl station "${INTERFACE}" get-networks | grep '\*' | cut -c 11-44 | sed -e 's#\ $##g'); do
|
for dev in $(iwctl station "${INTERFACE}" get-networks | grep '\*' | cut -c 11-44 | sed -e 's#\ $##g' -e 's| |#|g'); do
|
||||||
echo "${dev}"
|
echo "${dev}"
|
||||||
[[ "${1}" ]] && echo "${1}"
|
[[ "${1}" ]] && echo "${1}"
|
||||||
done
|
done
|
||||||
|
@ -24,39 +24,41 @@ essid_scan() {
|
||||||
|
|
||||||
do_wireless() {
|
do_wireless() {
|
||||||
WLAN_HIDDEN=""
|
WLAN_HIDDEN=""
|
||||||
WLAN_ESSID=""
|
WLAN_SSID=""
|
||||||
WLAN_SECURITY=""
|
|
||||||
WLAN_KEY=""
|
WLAN_KEY=""
|
||||||
WPA_AUTH=""
|
WPA_AUTH=""
|
||||||
if [[ "${CONNECTION}" == "wireless" ]]; then
|
if [[ "${CONNECTION}" == "wireless" ]]; then
|
||||||
# disconnect the interface first!
|
# disconnect the interface first!
|
||||||
iwctl station "${INTERFACE}" disconnect
|
iwctl station "${INTERFACE}" disconnect
|
||||||
#shellcheck disable=SC2086,SC2046
|
#shellcheck disable=SC2086,SC2046
|
||||||
DIALOG --menu "Choose your ESSID:" 14 40 7 \
|
DIALOG --menu "Choose your SSID:" 14 40 7 \
|
||||||
$(essid_scan _) \
|
$(essid_scan _) \
|
||||||
"Hidden" "_" 2>"${ANSWER}" || return 1
|
"Hidden" "_" 2>"${ANSWER}" || return 1
|
||||||
WLAN_ESSID=$(cat "${ANSWER}")
|
WLAN_SSID=$(cat "${ANSWER}")
|
||||||
WLAN_CONNECT="connect"
|
WLAN_CONNECT="connect"
|
||||||
if [[ "${WLAN_ESSID}" = "Hidden" ]]; then
|
if [[ "${WLAN_SSID}" = "Hidden" ]]; then
|
||||||
DIALOG --inputbox "Enter the hidden ESSID:" 8 65 \
|
DIALOG --inputbox "Enter the hidden SSID:" 8 65 \
|
||||||
"secret" 2>"${ANSWER}" || return 1
|
"secret" 2>"${ANSWER}" || return 1
|
||||||
WLAN_ESSID=$(cat "${ANSWER}")
|
WLAN_SSID=$(cat "${ANSWER}")
|
||||||
WLAN_CONNECT="connect-hidden"
|
WLAN_CONNECT="connect-hidden"
|
||||||
fi
|
fi
|
||||||
|
# replace # with spaces again
|
||||||
|
#shellcheck disable=SC2001,SC2086
|
||||||
|
WLAN_SSID="$(echo ${WLAN_SSID} | sed -e 's|#|\ |g')"
|
||||||
#shellcheck disable=SC2001,SC2086
|
#shellcheck disable=SC2001,SC2086
|
||||||
while [[ -z "${WPA_AUTH}" ]]; do
|
while [[ -z "${WPA_AUTH}" ]]; do
|
||||||
# expect hidden network has a WLAN_KEY
|
# expect hidden network has a WLAN_KEY
|
||||||
#shellcheck disable=SC2143
|
#shellcheck disable=SC2143
|
||||||
if ! [[ "$(iwctl station "${INTERFACE}" get-networks | grep -w "${WLAN_ESSID}" | cut -c 45-49 | grep -q 'open')" ]] && [[ "${WLAN_CONNECT}" == "connect-hidden" ]]; then
|
if ! [[ "$(iwctl station "${INTERFACE}" get-networks | grep -w "${WLAN_SSID}" | cut -c 45-49 | grep -q 'open')" ]] && [[ "${WLAN_CONNECT}" == "connect-hidden" ]]; then
|
||||||
DIALOG --inputbox "Enter your KEY:" 8 50 "SecretWirelessKey" 2>"${ANSWER}" || return 1
|
DIALOG --inputbox "Enter your KEY:" 8 50 "SecretWirelessKey" 2>"${ANSWER}" || return 1
|
||||||
WLAN_KEY=$(cat "${ANSWER}")
|
WLAN_KEY=$(cat "${ANSWER}")
|
||||||
fi
|
fi
|
||||||
# time to connect
|
# time to connect
|
||||||
DIALOG --infobox "Connection to ${WLAN_ESSID} with ${INTERFACE} ..." 3 70
|
DIALOG --infobox "Connection to ${WLAN_SSID} with ${INTERFACE} ..." 3 70
|
||||||
if [[ -z "${WLAN_KEY}" ]]; then
|
if [[ -z "${WLAN_KEY}" ]]; then
|
||||||
iwctl station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_ESSID}" && WPA_AUTH="1"
|
iwctl station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_SSID}" && WPA_AUTH="1"
|
||||||
else
|
else
|
||||||
iwctl --passphrase="${WLAN_KEY}" station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_ESSID}" && WPA_AUTH="1"
|
iwctl --passphrase="${WLAN_KEY}" station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_SSID}" && WPA_AUTH="1"
|
||||||
fi
|
fi
|
||||||
if [[ "${WPA_AUTH}" == "1" ]]; then
|
if [[ "${WPA_AUTH}" == "1" ]]; then
|
||||||
DIALOG --infobox "Authentification successfull. Continuing in 3 seconds ..." 3 70
|
DIALOG --infobox "Authentification successfull. Continuing in 3 seconds ..." 3 70
|
||||||
|
@ -128,7 +130,7 @@ donetwork() {
|
||||||
export "${i}"="${PROXY}"
|
export "${i}"="${PROXY}"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
DIALOG --yesno "Are these settings correct?\n\nInterface: ${INTERFACE}\nConnection: ${CONNECTION}\nNetctl profile: ${NETWORK_PROFILE}\nESSID: ${WLAN_ESSID}\nHidden: ${WLAN_HIDDEN}\nEncryption: ${WLAN_SECURITY}\nKey: ${WLAN_KEY}\ndhcp or static: ${IP}\nIP address: ${IPADDR}\nGateway: ${GW}\nDNS server: ${DNS}\nProxy setting: ${PROXY}" 0 0
|
DIALOG --yesno "Are these settings correct?\n\nInterface: ${INTERFACE}\nConnection: ${CONNECTION}\nNetctl profile: ${NETWORK_PROFILE}\nSSID: ${WLAN_SSID}\nHidden: ${WLAN_HIDDEN}\nKey: ${WLAN_KEY}\ndhcp or static: ${IP}\nIP address: ${IPADDR}\nGateway: ${GW}\nDNS server: ${DNS}\nProxy setting: ${PROXY}" 0 0
|
||||||
case $? in
|
case $? in
|
||||||
1) ;;
|
1) ;;
|
||||||
0) NETPARAMETERS="1" ;;
|
0) NETPARAMETERS="1" ;;
|
||||||
|
|
Loading…
Reference in a new issue