[X2Go-Commits] [x2goclient] 02/08: macbuild.sh: use more quoting and curly braces for referencing variables.

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 343073a1ffae1d8e494e1ca35e12d9fb118c3d92
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 14 05:16:32 2015 +0100

    macbuild.sh: use more quoting and curly braces for referencing variables.
---
 debian/changelog |    2 ++
 macbuild.sh      |   36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd7a26a..6838152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -173,6 +173,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
         + debian/rules
         + x2goclient.spec
     - Whitespace fix in Info.plist.
+    - Use more quoting and curly braces for referencing variables in
+      macbuild.sh.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/macbuild.sh b/macbuild.sh
index bda1866..729ec13 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
-NAME=x2goclient
-APPBUNDLE=./$NAME.app
-DMGFILE=./$NAME.dmg
-PROJECT=./$NAME.pro
-PKG_DMG=./pkg-dmg
+NAME="x2goclient"
+APPBUNDLE="./${NAME}.app"
+DMGFILE="./${NAME}.dmg"
+PROJECT="./${NAME}.pro"
+PKG_DMG="./pkg-dmg"
 
-NXPROXY=`which nxproxy`
-LIBXCOMP=libXcomp.3.dylib
-LIBPNG=libpng15.15.dylib
-LIBJPEG=libjpeg.9.dylib
-LIBZ=libz.1.dylib
+NXPROXY="$(which nxproxy)"
+LIBXCOMP="libXcomp.3.dylib"
+LIBPNG="libpng15.15.dylib"
+LIBJPEG="libjpeg.9.dylib"
+LIBZ="libz.1.dylib"
 
 set -e
 
@@ -39,23 +39,23 @@ phase "Running make"
 make -j2
 
 phase "Copying nxproxy"
-mkdir -p "$APPBUNDLE/Contents/exe"
-cp "$NXPROXY" "$APPBUNDLE/Contents/exe"
+mkdir -p "${APPBUNDLE}/Contents/exe"
+cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe"
 dylibbundler \
-	--fix-file "$APPBUNDLE/Contents/exe/nxproxy" \
+	--fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \
 	--bundle-deps \
-	--dest-dir "$APPBUNDLE/Contents/Frameworks" \
+	--dest-dir "${APPBUNDLE}/Contents/Frameworks" \
 	--install-path "@executable_path/../Frameworks/" \
 	--create-dir
 
 phase "Bundling up using macdeployqt"
-macdeployqt "$APPBUNDLE" -verbose=2
+macdeployqt "${APPBUNDLE}" -verbose=2
 
 phase "Creating DMG"
-$PKG_DMG \
-	--source "$APPBUNDLE" \
+${PKG_DMG} \
+	--source "${APPBUNDLE}" \
 	--sourcefile \
-	--target "$DMGFILE" \
+	--target "${DMGFILE}" \
 	--volname "x2goclient" \
 	--verbosity 2 \
 	--mkdir "/.background" \

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git