[X2Go-Commits] [x2goclient] 02/09: macbuild.sh: fix TOP_DIR handling.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 16 04:15:29 CET 2015


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

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

commit e7cb70a78fad15da288d213d0f42c98aab8886f5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 16 03:17:13 2015 +0100

    macbuild.sh: fix TOP_DIR handling.
---
 debian/changelog |    1 +
 macbuild.sh      |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ce87a34..528ba32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -206,6 +206,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Add debug mode selector via DEBUG env variable to macbuild.sh.
     - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4.
     - Select stdlib on OS X based on the passed or default SDK value.
+    - Fix TOP_DIR handling 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 642f6f3..603088a 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 NAME="x2goclient"
-TOP_DIR="${PWD}"
+
+TOP_DIR="$(dirname "$0")"
+[[ "${TOP_DIR}" == /* ]] || TOP_DIR="${PWD}/${TOP_DIR#./}"
 BUILD_DIR="${TOP_DIR}/build_client"
 APPBUNDLE="${BUILD_DIR}/${NAME}.app"
 DMGFILE="${BUILD_DIR}/${NAME}.dmg"

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


More information about the x2go-commits mailing list