[X2Go-Commits] [live-build-x2go] 65/108: fixed download routine for X background images, would not work with multiple URLs
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 20 22:13:18 CET 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.
commit 5bb444f0f3464efc4255f43765bca70e0af48ce8
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Fri Jan 4 21:00:31 2019 +0100
fixed download routine for X background images, would not work with multiple URLs
---
config/includes.chroot/etc/X11/Xsession.d/60x11-set-background | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background
index 1bb981e..9d932af 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background
@@ -1,5 +1,5 @@
# set screen background to X2Go default blue on all detected screens, unless color or image is specified
-XROOT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "xroot" { print $2 }' | tr -dc '0-9a-zA-Z,$-_.+!*'"'"'();/?:@=&')
+XROOT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "xroot" { print $2 }' | tr -dc '0-9a-zA-Z,$-_.+!*'"'"'();/?:@=&|')
XROOTMODE=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"xrootmode"==$1 {print $2}')
IMAGEDIR=/var/tmp/images/
@@ -19,7 +19,7 @@ if [ -n "$XROOT" ] ; then
elif echo "$XROOT" | grep -q "://" ; then
# this could be an URI
# TODO move this download part to an earlier script
- wget -P $IMAGEDIR/background/ "${XROOT/|/ }"
+ wget -P $IMAGEDIR/background/ ${XROOT/|/ }
if [ $(ls $IMAGEDIR 2>/dev/null| wc -l) -gt 0 ] ; then
#input validation
case "${XROOTMODE,,}" in # force lowercase
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list