[X2Go-Commits] [x2goclient] 39/44: macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX.

git-admin at x2go.org git-admin at x2go.org
Fri May 22 17:06:17 CEST 2015


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

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

commit 156d7a49516cf38456d7a356d350bbad06f806d0
Author: Mihai Moldovan <ionic at 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 c6ff465..598d929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -467,6 +467,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - 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.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/macbuild.sh b/macbuild.sh
index 83e0228..85ae181 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -108,7 +108,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
@@ -120,6 +119,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"}
 : ${DEBUG:="0"}
@@ -149,6 +150,11 @@ else
 	exit 1
 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


More information about the x2go-commits mailing list