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

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

commit 3c0c58aa4a633876d963c08875b58d3ba8b5c9da
Author: Mihai Moldovan <io...@ionic.de>
Date:   Wed Sep 30 23:30:48 2015 +0200

    macbuild.sh: fix removal of base prefix in deduplication if base prefix 
ends in a slash.
---
 debian/changelog |    2 ++
 macbuild.sh      |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 642d0fe..55b9115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -161,6 +161,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       functionality "for real", not just as a dry-run.
     - macbuild.sh: spelling fix.
     - macbuild.sh: more more debug messages and a whitespace change.
+    - macbuild.sh: fix removal of base prefix in deduplication if base prefix
+      ends in a slash.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index 9e44f15..25de145 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -394,7 +394,7 @@ if [ "${BUNDLE}" = "1" ]; then
 
   typeset -a top_files
   for entry in "${all_files[@]}"; do
-    typeset relative_path="${entry##"${base_dir}/"}"
+    typeset relative_path="${entry##"$(lazy_canonical_path "${base_dir}/")"}"
     typeset tmp_regex='^[^/]+$'
     echo "Checking ${relative_path} against regex '${tmp_regex}'"
     if [[ "${relative_path}" =~ ${tmp_regex} ]]; then
@@ -405,7 +405,7 @@ if [ "${BUNDLE}" = "1" ]; then
 
   typeset -a duplicates
   for entry in "${all_files[@]}"; do
-    typeset relative_path="${entry##"${base_dir}/"}"
+    typeset relative_path="${entry##"$(lazy_canonical_path "${base_dir}/")"}"
     typeset file_name="$(basename "${entry}")"
     typeset top_entry=""
     for top_entry in "${top_files[@]}"; do
@@ -447,7 +447,7 @@ if [ "${BUNDLE}" = "1" ]; then
     typeset -i i="0"
     for i in "${!all_files[@]}"; do
       typeset all_entry="${all_files[${i}]}"
-      typeset relative_path="${all_entry##"${base_dir}/"}"
+      typeset relative_path="${all_entry##"$(lazy_canonical_path 
"${base_dir}/")"}"
       if [ "${relative_path}" = "${entry}" ]; then
         unset all_files[${i}]
       fi

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