[dak/master] Remove version and arch from all win32-loader byhand files.
---
scripts/debian/byhand-win32-loader | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/debian/byhand-win32-loader b/scripts/debian/byhand-win32-loader
index 68ea693..fff1974 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,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}${WIN32_LOADER_FILE}"
+chmod 0644 "${TARGET}${TARGET_FILENAME}"
exit 0
--
1.5.6.5
Reply to: