MacOS: Preserve symlinks

Yubico · Apr 30, 2024 · 5e2ee8b · 5e2ee8b
1 parent c08a58c
commit 5e2ee8b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -57,6 +57,11 @@ jobs:
         working-directory: ./dist
         run: ./scripts/make_pkg.sh
 
+      - name: Tar to preserve symlinks
+        run: |
+          tar -czf dist/ykman.tar.gz -C dist "ykman"
+          rm -rf dist/ykman/
+
       - name: Upload build
         uses: actions/upload-artifact@v4
         with:

diff --git a/resources/macos/make_release.sh b/resources/macos/make_release.sh
@@ -14,13 +14,10 @@ CWD=`pwd`
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 echo "Script dir: $SCRIPT_DIR"
 
+echo "Unpack from tar.gz"
 SOURCE_DIR="$CWD/ykman"
-
-# Ensure executable, since we may have unpacked from zip
-chmod +x $SOURCE_DIR/ykman
-
-# Remove Python framework directory as it isn't needed
-rm -rf $SOURCE_DIR/_internal/Python.framework
+rm -rf $SOURCE_DIR
+tar xfa ykman.tar.gz
 
 RELEASE_VERSION=`$SOURCE_DIR/ykman --version | awk '{print $(NF)}'`
 PKG="yubikey-manager-$RELEASE_VERSION-mac.pkg"