Merge remote branch 'odyx/win32-loader-autobyhand' into merge

* odyx/win32-loader-autobyhand:
  Remove version and arch from all win32-loader byhand files.
  Chmod the win32-loader byhand files to 0644

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/scripts/debian/byhand-win32-loader b/scripts/debian/byhand-win32-loader
index 2a4abf1b125fc944031cd4f7b0b97ae148f356f4..fff19742edd2696ab059bc2fb6143052fd82e7da 100755 (executable)
--- 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,12 +35,19 @@ 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"
+cp "$WIN32_LOADER_FILE" "${TARGET}${TARGET_FILENAME}"
+
+# Chmod it correctly
+chmod 0644 "${TARGET}${TARGET_FILENAME}"
 
 exit 0