Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update killall #47

Merged
merged 1 commit into from
Feb 8, 2025
Merged

chore: update killall #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ main_screen() {
fi
fi

killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
"$progdir/bin/minui-list-$PLATFORM" --file "$minui_list_file" --format text --header "Wifi Configuration"
}

Expand All @@ -100,7 +100,7 @@ networks_screen() {
sleep 1
done

killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
"$progdir/bin/minui-list-$PLATFORM" --file "$minui_list_file" --format text --header "Wifi Networks"
}

Expand All @@ -114,7 +114,7 @@ password_screen() {
initial_password="$(grep "^$SSID:" "$SDCARD_PATH/wifi.txt" | cut -d':' -f2- | xargs)"
fi

killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
password="$("$progdir/bin/minui-keyboard-$PLATFORM" --header "Enter Password" --initial-value "$initial_password")"
exit_code=$?
if [ "$exit_code" -eq 2 ]; then
Expand Down Expand Up @@ -153,7 +153,7 @@ show_message() {
seconds="forever"
fi

killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
echo "$message" 1>&2
if [ "$seconds" = "forever" ]; then
"$progdir/bin/sdl2imgshow" \
Expand Down Expand Up @@ -385,7 +385,7 @@ network_loop() {
show_message "Connecting to $SSID..." forever
if ! wifi_on; then
show_message "Failed to start wifi!" 2
killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
exit 1
fi
break
Expand All @@ -396,7 +396,7 @@ network_loop() {

cleanup() {
rm -f /tmp/stay_awake
killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
}

main() {
Expand Down Expand Up @@ -459,7 +459,7 @@ main() {
show_message "Disconnecting from wifi..." forever
if ! wifi_off; then
show_message "Failed to stop wifi!" 2
killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
exit 1
fi
show_message "Refreshing connection..." forever
Expand All @@ -472,7 +472,7 @@ main() {
show_message "Disconnecting from wifi..." forever
if ! wifi_off; then
show_message "Failed to stop wifi!" 2
killall sdl2imgshow 2>/dev/null || true
killall sdl2imgshow >/dev/null 2>&1 || true
exit 1
fi
elif echo "$selection" | grep -q "^Toggle start on boot$"; then
Expand Down