fixup! MNT: Windows portable ZIP release (#30)

Author: kernc

.github/workflows/ci.yml

@@ -155,15 +155,18 @@ jobs:
       #- run: dist/*.exe /verysilent /log=installer.log && type installer.log
       #  shell: bash
 
+      - run: choco install zip
       - run: packaging/win/create-portable-zip.sh
+        shell: bash
+
       - uses: actions/upload-artifact@v4
         with:
           name: Windows installer
           path: dist/*.exe
       - uses: actions/upload-artifact@v4
         with:
           name: Windows portable
-          path: dist/*.zip
+          path: dist/efck-chat-keyboard/
       - uses: softprops/action-gh-release@v2
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
         with:

packaging/win/create-portable-zip.sh

@@ -5,36 +5,24 @@ set -eux
 # It assumes that PyInstaller has already been run and the application
 # is built in the dist/efck-chat-keyboard directory.
 
-# Navigate to the project root
-cd "$(dirname "$0")/../../"
-
 APP_NAME="efck-chat-keyboard"
 DIST_DIR="dist"
-PORTABLE_DIR_SOURCE="$DIST_DIR/$APP_NAME" # This is the folder created by PyInstaller's COLLECT
-TARGET_ZIP_FILE_BASENAME="${APP_NAME}-portable-win"
-TARGET_ZIP_FILE="$DIST_DIR/${TARGET_ZIP_FILE_BASENAME}.zip"
+TARGET_ZIP_FILE="${APP_NAME}-portable-win64.zip"
+
+cd "$DIST_DIR"
+rm -vf "$TARGET_ZIP_FILE"
 
 # Check if the source directory exists
-if [ ! -d "$PORTABLE_DIR_SOURCE" ]; then
-    echo "Error: Source directory $PORTABLE_DIR_SOURCE does not exist."
+if [ ! -d "$APP_NAME" ]; then
+    echo "Error: Source directory $DIST_DIR/$APP_NAME does not exist."
     echo "Please run PyInstaller first (e.g., pyinstaller packaging/pyinstaller.spec from project root)."
     exit 1
-fi
-
-echo "Source directory: $(pwd)/$PORTABLE_DIR_SOURCE"
-echo "Target ZIP file: $(pwd)/$TARGET_ZIP_FILE"
-
-# Remove old zip file if it exists
-rm -f "$TARGET_ZIP_FILE"
+fi >&2
 
 # Create the ZIP archive.
 # Change directory to the parent of $APP_NAME (i.e., $DIST_DIR)
 # so that the archive contains $APP_NAME as the root folder.
 # This way, when the user extracts, they get a single folder.
-(cd "$DIST_DIR" && zip -r "${TARGET_ZIP_FILE_BASENAME}.zip" "$APP_NAME" -x "*/.DS_Store" "*/__MACOSX")
-
-# To create a zip where contents of $PORTABLE_DIR_SOURCE are at the root of the zip:
-# (cd "$PORTABLE_DIR_SOURCE" && zip -r "../${TARGET_ZIP_FILE_BASENAME}.zip" . -x ".DS_Store" "__MACOSX")
-
+zip -r "$TARGET_ZIP_FILE" "$APP_NAME"
 
-echo "Successfully created portable ZIP: $TARGET_ZIP_FILE"
+echo "$DIST_DIR/$TARGET_ZIP_FILE"