[X2Go-Commits] [x2goclient] 89/217: macbuild.sh: copy "special" files, so that they can be removed later on.
git-admin at x2go.org
git-admin at x2go.org
Sat Aug 27 19:25:00 CEST 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 665f0b78927773b6fcf65f10166f65fc8face17d
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 313d514..948aca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -192,6 +192,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- 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:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index 25de145..9bba392 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -430,7 +430,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