[X2Go-Commits] [live-build-x2go] 29/59: added urldecoder so live-build won't choke on | symbol any more -> using %7C instead of | in build config

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-buster
in repository live-build-x2go.

commit 89dd0d0621f723996199a698554dd68358c942e7
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Jun 20 00:43:42 2020 +0000

    added urldecoder so live-build won't choke on | symbol any more -> using
    %7C instead of | in build config
---
 config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs
index 307dcfd..3334bdb 100755
--- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs
+++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs
@@ -5,6 +5,10 @@ XSAVERIMAGES=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e
 IMAGEDIR=/var/tmp/images/
 SLIDESDIR="${IMAGEDIR}/slides/"
 
+function urldecode() { 
+	: "${*//+/ }"; echo -e "${_//%/\\x}"; 
+}
+
 mkdir -p $SLIDESDIR
 
 if [ -n "$XSAVERIMAGES" ] ; then
@@ -24,6 +28,7 @@ if [ -n "$XSAVERIMAGES" ] ; then
 		done
 
 		echo -en "\n$(date +'%F | %T | ')'$0': Attempting screensaver image/images download ..." | tee -a /dev/tty8
+		XSAVERIMAGES=$(urldecode "$XSAVERIMAGES")
 		if echo "$XSAVERIMAGES" | grep -q "^tftp://" ; then
 			for SINGLEXSAVERIMAGEURL in ${XSAVERIMAGES//|/ }; do
 				XSAVERIMAGESERVER=$(echo "$SINGLEXSAVERIMAGEURL" | sed 's#^tftp://\([^/;]*\)/.*$#\1#' )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git