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 65d1f40a812f4ae95dddd97c85b995b10ba9e678 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Apr 25 23:14:18 2017 +0200 Fixup last patch: more quotes, no useless use of cat. --- .../lib/live/config/2800-x2go-thinclientconfig | 40 ++++++++++------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 1cb0cbb..49b9f0f 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -142,13 +142,13 @@ fi ADDOPTS="" # append custom background image if one was retrieved to additional options -if [ -e /home/user/custom/background.svg ]; then - ADDOPTS="\$ADDOPTS --background=/home/user/custom/background.svg" +if [ -e "/home/user/custom/background.svg" ]; then + ADDOPTS="\$ADDOPTS --background='/home/user/custom/background.svg'" fi # append custom branding image if one was retrieved to additional options -if [ -e /home/user/custom/background.svg ]; then - ADDOPTS="\$ADDOPTS --branding=/home/user/custom/branding.svg" +if [ -e "/home/user/custom/background.svg" ]; then + ADDOPTS="\$ADDOPTS --branding='/home/user/custom/branding.svg'" fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$ADDOPTS @@ -163,27 +163,25 @@ chown user:user /home/user/{export,logins,mounts} chmod 700 /home/user/{export,logins,mounts} # handle custom images passed in on boot parameters -mkdir /home/user/custom -chown user:user /home/user/custom -chmod 755 /home/user/custom -BGURL=$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^backgroundurl=/ { print $2 }') -if [ -n $BGURL ]; then - /usr/bin/wget $BGURL -q -O /home/user/custom/background.svg +mkdir "/home/user/custom" +chown user:user "/home/user/custom" +chmod 755 "/home/user/custom" +BGURL="$(tr ' ' '\n' < /proc/cmdline | \ + awk -F'=' ' /^backgroundurl=/ { print $2 }')" +if [ -n "$BGURL" ]; then + /usr/bin/wget "$BGURL" -q -O "/home/user/custom/background.svg" fi -BRNDURL=$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^brandingurl=/ { print $2 }') -if [ -n $BRNDURL ]; then - /usr/bin/wget $BRNDURL -q -O /home/user/custom/branding.svg +BRNDURL="$(tr ' ' '\n' < /proc/cmdline | \ + awk -F'=' ' /^brandingurl=/ { print $2 }')" +if [ -n "$BRNDURL" ]; then + /usr/bin/wget "$BRNDURL" -q -O "/home/user/custom/branding.svg" fi #only try to set permissions if files exist -CUSTFILES=(/home/user/custom/*) -if [ -e ${CUSTFILES[0]} ]; then - chown user:user /home/user/custom/* - chmod 644 /home/user/custom/* +CUSTFILES=("/home/user/custom/"*) +if [ -e "${CUSTFILES[0]}" ]; then + chown user:user "/home/user/custom/"* + chmod 644 "/home/user/custom/"* fi } -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git