Merge pull request 'Update fallback-ap.sh' (#15) from ztimson-patch-15 into master

Reviewed-on: #15

fallback-ap.sh

@@ -19,7 +19,7 @@ if [ -f "$CONFIG_FILE" ]; then source "$CONFIG_FILE"; fi
 WLAN0_IFACE="${FALLBACK_AP_IFACE:-${SAVED_IFACE:-wlan0}}"
 
 AP_NAME="${FALLBACK_AP_SSID:-${SAVED_SSID:-$HOSTNAME}}"
-AP_PASSWORD="${FALLBACK_AP_PASSWORD:-${SAVED_PASSWORD:-guesswhatitis}}"
+AP_PASSWORD="${FALLBACK_AP_PASSWORD:-${SAVED_PASSWORD:-abcd1234}}"
 AP_ENCRYPTION="${FALLBACK_AP_ENCRYPTION:-${SAVED_ENCRYPTION:-wpa-psk}}" # none | wpa-psk | sae
 
 FALLBACK_AP_CIDR="${FALLBACK_AP_CIDR:-${SAVED_CIDR:-10.10.10.1/24}}"

install.sh

@@ -13,17 +13,28 @@ fi
 
 prompt() {
     local __var="$1" __question="$2" __default="$3" __answer=""
-    if [ -e /dev/tty ]; then
+    read -r -p "$__question [$__default]: " __answer < /dev/tty || __answer=""
-        read -r -p "$__question [$__default]: " __answer < /dev/tty || __answer=""
-    fi
     printf -v "$__var" '%s' "${__answer:-$__default}"
 }
 
-[ -z "${FALLBACK_AP_SSID:-}" ]              && prompt FALLBACK_AP_SSID "Access point SSID" "$(hostname)"
+EXISTING_CONFIG="/etc/fallback-ap.conf"
-[ -z "${FALLBACK_AP_PASSWORD:-}" ]          && prompt FALLBACK_AP_PASSWORD "Access point passphrase" "guesswhatitis"
+
-[ -z "${FALLBACK_AP_CIDR:-}" ]              && prompt FALLBACK_AP_CIDR "Access point subnet (CIDR)" "10.10.10.1/24"
+if [ -f "$EXISTING_CONFIG" ]; then
-[ -z "${FALLBACK_AP_DHCP_START_OCTET:-}" ]  && prompt FALLBACK_AP_DHCP_START_OCTET "DHCP range start (last octet)" "100"
+    # shellcheck disable=SC1090
-[ -z "${FALLBACK_AP_DHCP_END_OCTET:-}" ]    && prompt FALLBACK_AP_DHCP_END_OCTET "DHCP range end (last octet)" "250"
+    source "$EXISTING_CONFIG"
+fi
+
+DEFAULT_SSID="${SAVED_SSID:-$(hostname)}"
+DEFAULT_PASSWORD="${SAVED_PASSWORD:-abcd1234}"
+DEFAULT_CIDR="${SAVED_CIDR:-10.10.10.1/24}"
+DEFAULT_DHCP_START_OCTET="${SAVED_DHCP_START_OCTET:-100}"
+DEFAULT_DHCP_END_OCTET="${SAVED_DHCP_END_OCTET:-250}"
+
+[ -z "${FALLBACK_AP_SSID:-}" ]              && prompt FALLBACK_AP_SSID "Access point SSID" "$DEFAULT_SSID"
+[ -z "${FALLBACK_AP_PASSWORD:-}" ]          && prompt FALLBACK_AP_PASSWORD "Access point passphrase" "$DEFAULT_PASSWORD"
+[ -z "${FALLBACK_AP_CIDR:-}" ]              && prompt FALLBACK_AP_CIDR "Access point subnet (CIDR)" "$DEFAULT_CIDR"
+[ -z "${FALLBACK_AP_DHCP_START_OCTET:-}" ]  && prompt FALLBACK_AP_DHCP_START_OCTET "DHCP range start (last octet)" "$DEFAULT_DHCP_START_OCTET"
+[ -z "${FALLBACK_AP_DHCP_END_OCTET:-}" ]    && prompt FALLBACK_AP_DHCP_END_OCTET "DHCP range end   (last octet)" "$DEFAULT_DHCP_END_OCTET"
 
 export FALLBACK_AP_SSID FALLBACK_AP_PASSWORD FALLBACK_AP_CIDR FALLBACK_AP_DHCP_START_OCTET FALLBACK_AP_DHCP_END_OCTET