[X2Go-Commits] [x2goclient] 76/139: deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 13 17:27:43 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 d487e4fe224879bee1526ebbfba968bc5d0ffa63
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Aug 27 20:39:24 2015 +0200
deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now.
deduplicate.sh will eventually be merged into macbuild.sh anyway.
---
debian/changelog | 2 ++
deduplicate.sh | 12 ++++++++++++
2 files changed, 14 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c03bd8a..10e8718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
output.
- deduplicate.sh: save dependency format base string as a readonly
variable and use that instead of repeating a fixed string.
+ - deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now.
+ deduplicate.sh will eventually be merged into macbuild.sh anyway.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/deduplicate.sh b/deduplicate.sh
index 130a04e..dadf334 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -52,6 +52,18 @@ set +x
return 0
}
+lazy_canonical_path() {
+ typeset path="${1}"
+
+ typeset old_path=""
+ while [ "${old_path}" != "${path}" ]; do
+ old_path="${path}"
+ path="${path//\/\///}"
+ done
+
+ printf "${old_path}"
+}
+
typeset -a all_files
typeset entry=""
while read -r -d '' entry; do
--
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