[X2Go-Commits] [x2goclient] 90/139: macbuild.sh: copy "special" files, so that they can be removed later on.
git-admin at x2go.org
git-admin at x2go.org
Sun Jan 17 06:03:17 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 8384a431b028190e63f8b81e79a0b3931088173c
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Sep 30 23:42:01 2015 +0200
macbuild.sh: copy "special" files, so that they can be removed later on.
---
debian/changelog | 1 +
macbuild.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index d64ab8f..6033929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -176,6 +176,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- 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.
+ - macbuild.sh: copy "special" files, so that they can be removed later on.
* 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/macbuild.sh b/macbuild.sh
index 980400e..1b13a75 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -415,7 +415,7 @@ if [ "${BUNDLE}" = "1" ]; then
for special_file_regex in "${special_files_regex[@]}"; do
typeset tmp_regex='^'"${special_file_regex}"'$'
if [[ "${entry}" =~ ${tmp_regex} ]]; then
- mv -v "${base_dir}/$(basename "${entry}")" "${base_dir}/$(dirname "${special_file_regex}")/"
+ cp -v "${base_dir}/$(basename "${entry}")" "${base_dir}/$(dirname "${special_file_regex}")/"
duplicates[${i}]="$(basename "${entry}")"
echo "Renamed ${entry} in duplicates array to ${duplicates[${i}]}"
fi
--
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