X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbyhand-win32-loader;h=2006a195578cfa9bf796d3f65e0d64bb8e04ab07;hb=abcd0f018dc49a218ce70d22e97fc7b654fcf1c8;hp=2a4abf1b125fc944031cd4f7b0b97ae148f356f4;hpb=d4633de110db08057b892b8ee902dcbe4c942a1c;p=dak.git

diff --git a/scripts/debian/byhand-win32-loader b/scripts/debian/byhand-win32-loader
index 2a4abf1b..2006a195 100755
--- a/scripts/debian/byhand-win32-loader
+++ b/scripts/debian/byhand-win32-loader
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -u
 set -e
@@ -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,12 +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}${TARGET_FILENAME}"
 
 exit 0