From ccedfa046aad9eb411a1298c2572496768a039aa Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 6 Feb 2017 13:50:59 +0100
Subject: Revert "fix desktop scripts"

This reverts commit f52eb759f61e1806014972cb736e07479f157aa6.  I assume this was
intented to be a fix for e6a9dc22a4e58b565894f8cdb6a19755af7b14de "tdf#105204
fix shellcheck warnings in desktop/scripts" (later addressed with
7ba0b28cc3ac82f5c5c6d7e2536cb89771041893 "Unbreak soffice.sh").  But I think
these quotations are actually useful parts of that original commit.  I fail to
see how pathname expansion (aka globbing; nor field splitting, if that is what
was actually meant in "we want globbing here") should be a useful feature here.

Change-Id: I5c33c40cfe2a817f628442fed70a07f06dd275cc
---
 desktop/scripts/soffice.sh | 2 +-
 desktop/scripts/unopkg.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index aafc9859c483..f855fe79e8bf 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -81,7 +81,7 @@ test -n "$VALGRIND" && EXTRAOPT="--valgrind"
 # force the --record option if the RR variable is set
 test -n "$RR" && EXTRAOPT="--record"
 
-for arg in $@ $EXTRAOPT ; do
+for arg in "$@" $EXTRAOPT ; do
     case "$arg" in
         --record)
             if which rr >/dev/null 2>&1 ; then
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index c90a7db3aeed..c66da9b41ebe 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -58,7 +58,7 @@ AIX)
     ;;
 esac
 
-for arg in $@
+for arg in "$@"
 do
   case "$arg" in
        #collect all bootstrap variables specified on the command line
-- 
cgit