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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f55d8ebc7e64c784ee0dc2fe324aad118c07c6a4
Author: Mihai Moldovan <io...@ionic.de>
Date:   Sun May 3 23:28:02 2015 +0200

    macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX.
---
 debian/changelog |    1 +
 macbuild.sh      |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 06daee5..ec3b75f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - macbuild.sh: add new lazy_canonical_path() helper function.
     - macbuild.sh: add new get_nesting_level() helper function.
     - macbuild.sh: add new repeat_str() helper function.
+    - macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index e264e86..9ea2d32 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -110,7 +110,6 @@ DMGFILE="${BUILD_DIR}/${NAME}.dmg"
 PROJECT="${TOP_DIR}/${NAME}.pro"
 PKG_DMG="${TOP_DIR}/pkg-dmg"
 
-NXPROXY="$(which nxproxy)"
 # Try to find the MacPorts prefix.
 typeset MACPORTS_PREFIX_SEARCH=""
 if type -P port >/dev/null 2>&1; then
@@ -122,6 +121,8 @@ else
        MACPORTS_PREFIX_SEARCH="/opt/local/"
 fi
 
+NXPROXY="nxproxy"
+
 : 
${SDK:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}
 : ${MACOSX_DEPLOYMENT_TARGET:="10.7"}
 : ${FORCE_STDLIB:="0"}
@@ -164,6 +165,11 @@ else
        fi
 fi
 
+# Gather files.
+NXPROXY="$(lazy_canonical_path "${MACPORTS_PREFIX}/bin/${NXPROXY}")"
+
+[ -x "${NXPROXY}" ] || dependency_error "nxproxy" "nxproxy" "binary"
+
 set -e
 
 phase "Cleaning"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to