Name resulting xsde binary archive as xsde-<version>-x86_64-windows10.zip in download scriptHEADmaster

1 files changed, 10 insertions, 6 deletions

diff --git a/build2/download b/build2/download
index 80d9b08..d3ffe4a 100755
--- a/build2/download
+++ b/build2/download
@@ -6,7 +6,7 @@
 # xsde-<version>-x86_64-windows*.zip binary archives with the libxsde and
 # xsde-{tests,examples} source archives and the dist directory of the xsde git
 # repository into the xsde-<version>-{x86_64-linux.tar.xz,rtsrc-unix.tar.gz}
-# and xsde-<version>-x86_64-windows.zip archives with the secondary build
+# and xsde-<version>-x86_64-windows<X>.zip archives with the secondary build
 # system, respectively.
 #
 # Run from the root of the destination download directory. Note that the
@@ -468,22 +468,26 @@ for bk in "${!bins[@]}"; do
                   usr/local/share/man/man1 \
                   "" # windows
 
-      rm -r "$pkgf"
+      rm "$pkgf"
     fi
 
-    # Create the xsde-<version>-x86_64-windows.zip archive, similar to the
+    # Create the xsde-<version>-x86_64-windows<X>.zip archive, similar to the
     # above.
     #
+    # Note that here the destination xsde binary archive is created under the
+    # same name as the original archive. Thus, we create it in the current
+    # directory and then move it over the original archive.
+    #
     if [ -n "$(sed -rn -e 's/^xsde-.+-x86_64-windows.+\.zip$/true/p' <<<"$pkg")" ]; then
-      dest_arch="$(sed -rn -e 's%^(.+/xsde-[^/]+-x86_64)-[^/]+$%\1-windows.zip%p' <<<"$pkgf")"
+      dest_arch="$pkg"
 
-      create_arch "$dest_arch" "$pkgf" \
+      create_arch "$pkg" "$pkgf" \
                   bin \
                   share/doc/xsde \
                   share/man/man1 \
                   true # windows
 
-      rm -r "$pkgf"
+      mv "$pkg" "$pkgf"
     fi
   done