This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit 765935dcdabc23450d08d7ea1c2cbcb41ae2f9d7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 23 13:54:32 2024 +0100 de-array-ified, as we are forced to use dash instead of bash --- .../etc/X11/Xsession.d/60x11-blanking-dpms-config | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config index 4aad736..e80df32 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config @@ -2,8 +2,11 @@ BLANKINGTIME=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "blank" { print $2 }' | tr -dc '0-9:') if [ -n "$BLANKINGTIME" ]; then - DPMSARR=($(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 ~/^[0-9]*$/ && $3 ~/^[0-9]*$/ { print $1 " " $2 " " $3}')) - if [ ${DPMSARR[0]} -eq 0 ]; then + DPMSARR=$(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 ~/^[0-9]*$/ && $3 ~/^[0-9]*$/ { print $1 " " $2 " " $3}') + DPMSARR1=$(echo $DPMSARR | cut -d ' ' -f 1) + DPMSARR2=$(echo $DPMSARR | cut -d ' ' -f 2) + DPMSARR3=$(echo $DPMSARR | cut -d ' ' -f 3) + if [ $DPMSARR1 -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off if grep -q '\W*nodpms\W*' /proc/cmdline; then @@ -11,10 +14,10 @@ if [ -n "$BLANKINGTIME" ]; then fi else xset s on - xset s ${DPMSARR[0]} + xset s $DPMSARR1 if ! grep -q '\W*nodpms\W*' /proc/cmdline; then # Yes, "+dpms dpms" is intentional. - xset +dpms dpms ${DPMSARR[0]} ${DPMSARR[1]} ${DPMSARR[2]} + xset +dpms dpms $DPMSARR1 $DPMSARR2 $DPMSARR3 fi fi fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git