V3 aktuallisiert
This commit is contained in:
1 parent
98c6d95c45
commit
6a1a247a39
1 file changed
+20
-79
+20
-79
@@ -83,34 +83,13 @@ if [[ -f "$CONFIG" ]]; then
|
|||||||
UPDATE_TIME="${BASH_REMATCH[2]}"
|
UPDATE_TIME="${BASH_REMATCH[2]}"
|
||||||
|
|
||||||
case "$DAY_SYSTEMD" in
|
case "$DAY_SYSTEMD" in
|
||||||
Mon)
|
Mon) DAY="1"; DAY_NAME="Montag" ;;
|
||||||
DAY="1"
|
Tue) DAY="2"; DAY_NAME="Dienstag" ;;
|
||||||
DAY_NAME="Montag"
|
Wed) DAY="3"; DAY_NAME="Mittwoch" ;;
|
||||||
;;
|
Thu) DAY="4"; DAY_NAME="Donnerstag" ;;
|
||||||
Tue)
|
Fri) DAY="5"; DAY_NAME="Freitag" ;;
|
||||||
DAY="2"
|
Sat) DAY="6"; DAY_NAME="Samstag" ;;
|
||||||
DAY_NAME="Dienstag"
|
Sun) DAY="7"; DAY_NAME="Sonntag" ;;
|
||||||
;;
|
|
||||||
Wed)
|
|
||||||
DAY="3"
|
|
||||||
DAY_NAME="Mittwoch"
|
|
||||||
;;
|
|
||||||
Thu)
|
|
||||||
DAY="4"
|
|
||||||
DAY_NAME="Donnerstag"
|
|
||||||
;;
|
|
||||||
Fri)
|
|
||||||
DAY="5"
|
|
||||||
DAY_NAME="Freitag"
|
|
||||||
;;
|
|
||||||
Sat)
|
|
||||||
DAY="6"
|
|
||||||
DAY_NAME="Samstag"
|
|
||||||
;;
|
|
||||||
Sun)
|
|
||||||
DAY="7"
|
|
||||||
DAY_NAME="Sonntag"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -156,10 +135,10 @@ ask_yes_no() {
|
|||||||
while true; do
|
while true; do
|
||||||
|
|
||||||
if [[ "$current" == "yes" ]]; then
|
if [[ "$current" == "yes" ]]; then
|
||||||
read -r -p "$prompt [J/n]: " answer
|
read -r -p "$prompt [J/n]: " answer </dev/tty
|
||||||
answer="${answer:-j}"
|
answer="${answer:-j}"
|
||||||
else
|
else
|
||||||
read -r -p "$prompt [j/N]: " answer
|
read -r -p "$prompt [j/N]: " answer </dev/tty
|
||||||
answer="${answer:-n}"
|
answer="${answer:-n}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -220,61 +199,24 @@ echo
|
|||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
|
|
||||||
read -r -p "Wochentag [$DAY]: " NEW_DAY
|
read -r -p "Wochentag [$DAY]: " NEW_DAY </dev/tty
|
||||||
NEW_DAY="${NEW_DAY:-$DAY}"
|
NEW_DAY="${NEW_DAY:-$DAY}"
|
||||||
|
|
||||||
case "$NEW_DAY" in
|
case "$NEW_DAY" in
|
||||||
1)
|
1) DAY="1"; DAY_SYSTEMD="Mon"; DAY_NAME="Montag"; break ;;
|
||||||
DAY="1"
|
2) DAY="2"; DAY_SYSTEMD="Tue"; DAY_NAME="Dienstag"; break ;;
|
||||||
DAY_SYSTEMD="Mon"
|
3) DAY="3"; DAY_SYSTEMD="Wed"; DAY_NAME="Mittwoch"; break ;;
|
||||||
DAY_NAME="Montag"
|
4) DAY="4"; DAY_SYSTEMD="Thu"; DAY_NAME="Donnerstag"; break ;;
|
||||||
break
|
5) DAY="5"; DAY_SYSTEMD="Fri"; DAY_NAME="Freitag"; break ;;
|
||||||
;;
|
6) DAY="6"; DAY_SYSTEMD="Sat"; DAY_NAME="Samstag"; break ;;
|
||||||
2)
|
7) DAY="7"; DAY_SYSTEMD="Sun"; DAY_NAME="Sonntag"; break ;;
|
||||||
DAY="2"
|
*) echo "Bitte eine Zahl zwischen 1 und 7 eingeben." ;;
|
||||||
DAY_SYSTEMD="Tue"
|
|
||||||
DAY_NAME="Dienstag"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
3)
|
|
||||||
DAY="3"
|
|
||||||
DAY_SYSTEMD="Wed"
|
|
||||||
DAY_NAME="Mittwoch"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
4)
|
|
||||||
DAY="4"
|
|
||||||
DAY_SYSTEMD="Thu"
|
|
||||||
DAY_NAME="Donnerstag"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
5)
|
|
||||||
DAY="5"
|
|
||||||
DAY_SYSTEMD="Fri"
|
|
||||||
DAY_NAME="Freitag"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
6)
|
|
||||||
DAY="6"
|
|
||||||
DAY_SYSTEMD="Sat"
|
|
||||||
DAY_NAME="Samstag"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
7)
|
|
||||||
DAY="7"
|
|
||||||
DAY_SYSTEMD="Sun"
|
|
||||||
DAY_NAME="Sonntag"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Bitte eine Zahl zwischen 1 und 7 eingeben."
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
|
|
||||||
read -r -p "Uhrzeit [$UPDATE_TIME]: " NEW_TIME
|
read -r -p "Uhrzeit [$UPDATE_TIME]: " NEW_TIME </dev/tty
|
||||||
NEW_TIME="${NEW_TIME:-$UPDATE_TIME}"
|
NEW_TIME="${NEW_TIME:-$UPDATE_TIME}"
|
||||||
|
|
||||||
if [[ "$NEW_TIME" =~ ^([01][0-9]|2[0-3]):[0-5][0-9]$ ]]; then
|
if [[ "$NEW_TIME" =~ ^([01][0-9]|2[0-3]):[0-5][0-9]$ ]]; then
|
||||||
@@ -301,10 +243,9 @@ echo "Enter übernimmt die aktuelle Liste."
|
|||||||
echo "Ein einzelnes - entfernt alle Ausschlüsse."
|
echo "Ein einzelnes - entfernt alle Ausschlüsse."
|
||||||
echo
|
echo
|
||||||
|
|
||||||
read -r -p "Ausgeschlossene Gäste [${EXCLUDE_GUESTS:-keine}]: " NEW_EXCLUDES
|
read -r -p "Ausgeschlossene Gäste [${EXCLUDE_GUESTS:-keine}]: " NEW_EXCLUDES </dev/tty
|
||||||
|
|
||||||
if [[ -z "$NEW_EXCLUDES" ]]; then
|
if [[ -z "$NEW_EXCLUDES" ]]; then
|
||||||
# Vorhandene Liste behalten
|
|
||||||
:
|
:
|
||||||
elif [[ "$NEW_EXCLUDES" == "-" ]]; then
|
elif [[ "$NEW_EXCLUDES" == "-" ]]; then
|
||||||
EXCLUDE_GUESTS=""
|
EXCLUDE_GUESTS=""
|
||||||
|
|||||||
Reference in new issue
Block a user