X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbyhand-win32-loader;h=d0ef0a7e24b2d83cebd15488ab86d373a9c51020;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=68ea693595c59f15184cbf8935494e1795eb8a24;hpb=96b4cae49dd5d752de6767a25fb2b3a2b3b4deb1;p=dak.git

diff --git a/scripts/debian/byhand-win32-loader b/scripts/debian/byhand-win32-loader
index 68ea6935..d0ef0a7e 100755
--- a/scripts/debian/byhand-win32-loader
+++ b/scripts/debian/byhand-win32-loader
@@ -11,7 +11,7 @@ fi
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
-WIN32_LOADER_FILE="$1"	# *-win32-loader{.exe,txt}
+WIN32_LOADER_FILE="$1"	# win32-loader_${VERSION}_${ARCH}{.exe,txt}
 VERSION="$2"
 ARCH="$3"
 CHANGES="$4"	# Changes file for the upload
@@ -35,15 +35,21 @@ esac
 # This must end with /
 TARGET="${ftpdir}/tools/win32-loader/${SUITE}/"
 
+# Prepare the target filename by removing the version and arch parts;
+# transforms any/path/win32-loader_${VERSION}_${ARCH}.${extension} to win32-loader.${extension}
+TARGET_FILENAME="${WIN32_LOADER_FILE%%_*}.${WIN32_LOADER_FILE##*.}"
+
 # Check validity of the target directory
 if [ ! -d "$TARGET" ]; then
 	mkdir -p "$TARGET"
 fi
 
 # Put said file into the tools directory
-cp "$WIN32_LOADER_FILE" "$TARGET"
+# Use --remove-destination to avoid problems with the fact that the target may
+# be a hardlink and in that case we'd update multiple suites together
+cp --remove-destination "$WIN32_LOADER_FILE" "${TARGET}${TARGET_FILENAME}"
 
 # Chmod it correctly
-chmod 0644 "${TARGET}${WIN32_LOADER_FILE}"
+chmod 0644 "${TARGET}${TARGET_FILENAME}"
 
 exit 0