Refaktorer shutdown/genstart scripts: bekræftelse først, nedtælling til sidst

- Flyt Y/n bekræftelse til toppen, inden programmer lukkes
- Afslut med det samme ved 'n' i stedet for at køre alt først
- Erstat slutprompt med 3-sekunders nedtælling (Ctrl+C for at afbryde)
- Oversæt alle kommentarer og beskeder fra dansk til engelsk
This commit is contained in:
2026-05-23 23:32:01 +02:00
parent 43ce33acdd
commit 2d8321a530
2 changed files with 40 additions and 28 deletions
+20 -14
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Funktion til Flatpak apps # Function for Flatpak apps
close_flatpak() { close_flatpak() {
local app="$1" local app="$1"
flatpak kill "$app" flatpak kill "$app"
@@ -14,10 +14,10 @@ close_flatpak() {
done done
echo "$app force closing (KILL)..." echo "$app force closing (KILL)..."
pkill -KILL -f "$app" pkill -KILL -f "$app"
pkill -KILL -f bwrap 2>/dev/null # dræb sandbox container pkill -KILL -f bwrap 2>/dev/null # kill sandbox container
} }
# Funktion til native apps # Function for native apps
close_app() { close_app() {
local app="$1" local app="$1"
pkill -TERM -f "$app" pkill -TERM -f "$app"
@@ -34,13 +34,21 @@ close_app() {
pkill -KILL -f "$app" pkill -KILL -f "$app"
} }
# Luk apps # Prompt
read -r -p "Close all programs and reboot? [Y/n]: " response
response="${response:-Y}"
if [[ ! "$response" =~ ^[Yy]$ ]]; then
echo "Cancelled."
exit 0
fi
# Close apps
close_flatpak "com.discordapp.Discord" close_flatpak "com.discordapp.Discord"
close_flatpak "io.github.lullabyX.sone" close_flatpak "io.github.lullabyX.sone"
close_flatpak "rocks.shy.VacuumTube" close_flatpak "rocks.shy.VacuumTube"
close_app "firefox" close_app "firefox"
# Steam # Close Steam
if pgrep -f steam > /dev/null; then if pgrep -f steam > /dev/null; then
steam -shutdown steam -shutdown
for i in $(seq 1 5); do for i in $(seq 1 5); do
@@ -56,14 +64,12 @@ else
echo "Steam not running, skipping..." echo "Steam not running, skipping..."
fi fi
# Prompt # Countdown Ctrl+C to cancel
read -r -p "All programs closed. Reboot? [Y/n]: " response echo "All programs closed. Rebooting in:"
response="${response:-Y}" # Y er default ved enter for i in 3 2 1; do
echo " $i..."
if [[ "$response" =~ ^[Yy]$ ]]; then sleep 1
sudo shutdown -r now done
else sudo shutdown -r now
echo "Reboot cancelled."
fi
+20 -14
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Funktion til Flatpak apps # Function for Flatpak apps
close_flatpak() { close_flatpak() {
local app="$1" local app="$1"
flatpak kill "$app" flatpak kill "$app"
@@ -14,10 +14,10 @@ close_flatpak() {
done done
echo "$app force closing (KILL)..." echo "$app force closing (KILL)..."
pkill -KILL -f "$app" pkill -KILL -f "$app"
pkill -KILL -f bwrap 2>/dev/null # dræb sandbox container pkill -KILL -f bwrap 2>/dev/null # kill sandbox container
} }
# Funktion til native apps # Function for native apps
close_app() { close_app() {
local app="$1" local app="$1"
pkill -TERM -f "$app" pkill -TERM -f "$app"
@@ -34,13 +34,21 @@ close_app() {
pkill -KILL -f "$app" pkill -KILL -f "$app"
} }
# Luk apps # Prompt
read -r -p "Close all programs and shut down? [Y/n]: " response
response="${response:-Y}"
if [[ ! "$response" =~ ^[Yy]$ ]]; then
echo "Cancelled."
exit 0
fi
# Close apps
close_flatpak "com.discordapp.Discord" close_flatpak "com.discordapp.Discord"
close_flatpak "io.github.lullabyX.sone" close_flatpak "io.github.lullabyX.sone"
close_flatpak "rocks.shy.VacuumTube" close_flatpak "rocks.shy.VacuumTube"
close_app "firefox" close_app "firefox"
# Steam # Close Steam
if pgrep -f steam > /dev/null; then if pgrep -f steam > /dev/null; then
steam -shutdown steam -shutdown
for i in $(seq 1 5); do for i in $(seq 1 5); do
@@ -56,13 +64,11 @@ else
echo "Steam not running, skipping..." echo "Steam not running, skipping..."
fi fi
# Prompt # Countdown Ctrl+C to cancel
read -r -p "All programs closed. Shut down? [Y/n]: " response echo "All programs closed. Shutting down in:"
response="${response:-Y}" # Y er default ved enter for i in 3 2 1; do
echo " $i..."
if [[ "$response" =~ ^[Yy]$ ]]; then sleep 1
sudo shutdown -h now done
else sudo shutdown -h now
echo "Shutdown cancelled."
fi