diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index d86f6912e..27320dba8 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -30,10 +30,12 @@ jobs: architecture: x64 output-suffix: x64 xcode-path: '/Applications/Xcode_13.2.1.app' + fuse-lib: macFUSE - os: [self-hosted, macOS, ARM64] architecture: aarch64 output-suffix: arm64 xcode-path: '/Applications/Xcode_13.2.1.app' + fuse-lib: FUSE-T steps: - uses: actions/checkout@v3 - name: Setup Java @@ -177,7 +179,7 @@ jobs: run: | mkdir dmg mv Cryptomator.app dmg - cp dist/mac/dmg/resources/macFUSE.webloc dmg + cp dist/mac/dmg/resources/${{ matrix.fuse-lib }}.webloc dmg ls -l dmg - name: Install create-dmg run: | @@ -188,14 +190,14 @@ jobs: create-dmg --volname Cryptomator --volicon "dist/mac/dmg/resources/Cryptomator-Volume.icns" - --background "dist/mac/dmg/resources/Cryptomator-background.tiff" + --background "dist/mac/dmg/resources/Cryptomator-${{ matrix.fuse-lib }}-background.tiff" --window-pos 400 100 --window-size 640 694 --icon-size 128 --icon "Cryptomator.app" 128 245 --hide-extension "Cryptomator.app" - --icon "macFUSE.webloc" 320 501 - --hide-extension "macFUSE.webloc" + --icon "${{ matrix.fuse-lib }}.webloc" 320 501 + --hide-extension "${{ matrix.fuse-lib }}.webloc" --app-drop-link 512 245 --eula "dist/mac/dmg/resources/license.rtf" --icon ".background" 128 758 diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index a71b4f4b3..23917f9c5 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -27,6 +27,7 @@ MAIN_JAR_GLOB="cryptomator-*.jar" MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" REVISION_NO=`git rev-list --count HEAD` VERSION_NO=`mvn -f../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout | sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'` +FUSE_LIB="FUSE-T" # check preconditions if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi @@ -125,20 +126,20 @@ fi # prepare dmg contents mkdir dmg mv ${APP_NAME}.app dmg -cp resources/macFUSE.webloc dmg +cp resources/${FUSE_LIB}.webloc dmg # create dmg create-dmg \ --volname ${APP_NAME} \ --volicon "resources/${APP_NAME}-Volume.icns" \ - --background "resources/${APP_NAME}-background.tiff" \ + --background "resources/${APP_NAME}-${FUSE_LIB}-background.tiff" \ --window-pos 400 100 \ --window-size 640 694 \ --icon-size 128 \ --icon "${APP_NAME}.app" 128 245 \ --hide-extension "${APP_NAME}.app" \ - --icon "macFUSE.webloc" 320 501 \ - --hide-extension "macFUSE.webloc" \ + --icon "${FUSE_LIB}.webloc" 320 501 \ + --hide-extension "${FUSE_LIB}.webloc" \ --app-drop-link 512 245 \ --eula "resources/license.rtf" \ --icon ".background" 128 758 \ diff --git a/dist/mac/dmg/resources/Cryptomator-FUSE-T-background.tiff b/dist/mac/dmg/resources/Cryptomator-FUSE-T-background.tiff new file mode 100644 index 000000000..07dd16944 Binary files /dev/null and b/dist/mac/dmg/resources/Cryptomator-FUSE-T-background.tiff differ diff --git a/dist/mac/dmg/resources/Cryptomator-background.tiff b/dist/mac/dmg/resources/Cryptomator-macFUSE-background.tiff similarity index 100% rename from dist/mac/dmg/resources/Cryptomator-background.tiff rename to dist/mac/dmg/resources/Cryptomator-macFUSE-background.tiff diff --git a/dist/mac/dmg/resources/FUSE-T.webloc b/dist/mac/dmg/resources/FUSE-T.webloc new file mode 100644 index 000000000..5f3b480fc --- /dev/null +++ b/dist/mac/dmg/resources/FUSE-T.webloc @@ -0,0 +1,8 @@ + + + + + URL + https://www.fuse-t.org/ + +