From b1f5b73b5c98672c9b5248323479439dc498c49d Mon Sep 17 00:00:00 2001 From: Patrick McGuire Date: Tue, 16 Nov 2021 16:06:18 -0500 Subject: [PATCH 1/2] working on new welcome wizard --- scripts/reconfigure_birdnet_gui.sh | 2 +- scripts/welcome_wizard.sh | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/reconfigure_birdnet_gui.sh b/scripts/reconfigure_birdnet_gui.sh index aaa6f1c..ca2e850 100755 --- a/scripts/reconfigure_birdnet_gui.sh +++ b/scripts/reconfigure_birdnet_gui.sh @@ -51,4 +51,4 @@ fi ${birdnetpi_dir}/scripts/update_birdnet.sh xdg-open http://birdnetpi.local -systemctl --user disable birdnet-pi-config-gui +systemctl --user disable birdnet-pi-welcome-wizard.service diff --git a/scripts/welcome_wizard.sh b/scripts/welcome_wizard.sh index bfeef7b..cc96502 100755 --- a/scripts/welcome_wizard.sh +++ b/scripts/welcome_wizard.sh @@ -91,10 +91,19 @@ get_date_and_time() { } setup_wifi() { - zenity --title="Connect to WiFi" --window-icon=/usr/share/pixmaps/red-cardinal32.png --info --text="Use the Networking Icon in the top right corner of + sudo systemctl start dhcpcd + wifi_list="" + until [[ "${wifi_list}" == "Continue" ]];do + wifi_list="$(zenity --title="Connect to WiFi" --extra-button="Refresh WiFi List" --window-icon=/usr/share/pixmaps/red-cardinal32.png --info --text="Use the Networking Icon in the top right corner of the screen to select your WiFi network. Enter the credentials to connect when prompted. -Press \"Continue\" after you have connected." --ok-label="Continue" --no-wrap +Press \"Continue\" AFTER you have connected." --ok-label="Continue" --no-wrap)" + [ -z ${wifi_list} ] && break + if [[ "${wifi_list}" == "Refresh WiFi List" ]];then + sudo systemctl restart dhcpcd + fi +done + get_latitude } From 9861d5592fffebb828f055a95c93e84b5901e1d6 Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Wed, 17 Nov 2021 09:48:02 -0500 Subject: [PATCH 2/2] Update welcome_wizard.sh --- scripts/welcome_wizard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/welcome_wizard.sh b/scripts/welcome_wizard.sh index cc96502..51f87e2 100755 --- a/scripts/welcome_wizard.sh +++ b/scripts/welcome_wizard.sh @@ -94,7 +94,7 @@ setup_wifi() { sudo systemctl start dhcpcd wifi_list="" until [[ "${wifi_list}" == "Continue" ]];do - wifi_list="$(zenity --title="Connect to WiFi" --extra-button="Refresh WiFi List" --window-icon=/usr/share/pixmaps/red-cardinal32.png --info --text="Use the Networking Icon in the top right corner of + wifi_list="$(zenity --title="Connect to WiFi" --extra-button="Refresh WiFi List" --window-icon=/usr/share/pixmaps/red-cardinal32.png --info --text="Use the Networking Icon in the bottom right corner of the screen to select your WiFi network. Enter the credentials to connect when prompted. Press \"Continue\" AFTER you have connected." --ok-label="Continue" --no-wrap)"