From 99a7271e3b018e6de2d568bdab5a9c62f57ae2ce Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Jul 2015 20:39:58 +0200 Subject: roll-tarball.sh: Make sure symlinked files are included in tarballs. As the system a tarball gets extracted on may potentially be unable to handle symlinks, we ship symlinks as files in the rolled tarball. By transforming symlinks into real files, we also assure that all VERSION files/symlinks get shipped in the tarballs. Fixes ArcticaProject/nx-libs#27 --- debian/roll-tarballs.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index ecaeac2e0..2fba5a042 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -78,6 +78,20 @@ echo "Created tarball for $CHECKOUT" cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" +set -x +# Replace symlinks by copies of the linked target files +# Note: We don't have symlinked directories!!! +find . -type l | while read link; do + TARGET=$(readlink "$link") + cd $(dirname $link) + if [ -f "$TARGET" ]; then + rm -f $(basename $link) + cp ${TARGET} $(basename $link) + fi + cd - 1>/dev/null +done +set +x + mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball @@ -95,6 +109,7 @@ else rm -Rf "etc"* rm -Rf "doc/nx-X11_vs_XOrg69_patches"* rm -f "README.keystrokes" + rm -f "VERSION.x2goagent" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" @@ -114,9 +129,6 @@ rm -Rf ".pc/" rm -Rf "debian/" rm -Rf "nx-libs.spec" -# some file renamings -mv README.md README.NX-Development - # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; -- cgit v1.2.3