[X2Go-Commits] [x2goclient] 73/142: deduplicate.sh: switch to range-based for loop in fixup section for duplicate array walking as we need to access the same element index in the replacement array.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 14 05:10:21 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 85dfa92a4959e3f43e735720e68d637acd749e4e
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Aug 27 05:05:07 2015 +0200
deduplicate.sh: switch to range-based for loop in fixup section for duplicate array walking as we need to access the same element index in the replacement array.
---
debian/changelog | 3 +++
deduplicate.sh | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index d9890f5..a786f20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- deduplicate.sh: debug parse_otool_output fiercely for the time being.
- deduplicate.sh: prevent word splitting when parsing otool's output. We
want the raw bits.
+ - deduplicate.sh: switch to range-based for loop in fixup section for
+ duplicate array walking as we need to access the same element index in
+ the replacement array.
* 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 93a5c8f..d625590 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -154,7 +154,9 @@ for all_entry in "${all_files[@]}"; do
typeset dependencies_filename="$(basename "${line}")"
typeset duplicate_entry=""
- for duplicate_entry in ${duplicates[@]}; do
+ typeset -i i="0"
+ for i in "${!duplicates[@]}"; do
+ typeset duplicate_entry="${duplicates[${i}]}"
typeset duplicate_filename="$(basename "${duplicate_entry}")"
if [ -n "${dependencies_filename}" ] && [ -n "${duplicate_filename}"]; then
--
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