[X2Go-Commits] [x2goclient] 169/267: macbuild.sh: fix copying of resource files.

git-admin at x2go.org git-admin at x2go.org
Sat Dec 10 13:36:00 CET 2016


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

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

commit 33f98d3937e1139fc02148e6cb32282b88797d13
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat May 7 22:55:50 2016 +0200

    macbuild.sh: fix copying of resource files.
---
 debian/changelog |    1 +
 macbuild.sh      |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 034bf5e..15061ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -288,6 +288,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - macbuild.sh: add support for copying resource files. Currently only used
       for startup.wav.
     - res: rename "sound" to "audio".
+    - macbuild.sh: fix copying of resource files.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/macbuild.sh b/macbuild.sh
index f57d43c..6e36348 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -333,7 +333,7 @@ cp -av "${NXPROXY}" "${EXE_DIR}/"
 phase "Copying misc resources"
 typeset cur_res_file
 for cur_res_file in ${RESOURCE_FILES[@]}; do
-  cp -av "res/${cur_res_file}" "${RESOURCES_DIR}/"
+  cp -av "${TOP_DIR}/res/${cur_res_file}" "${RESOURCES_DIR}/"
 done
 
 phase "Copying PulseAudio"

--
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