From 82d7fb9b1dbbb893fe6f1af6facf1ef3e186aa22 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 13 Jul 2026 11:20:52 -0500 Subject: [PATCH] please. --- .../macos/create_macos_pr_build_ava.sh | 48 ++++--------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/distribution/macos/create_macos_pr_build_ava.sh b/distribution/macos/create_macos_pr_build_ava.sh index 14f1d8aa7..39998aeb6 100644 --- a/distribution/macos/create_macos_pr_build_ava.sh +++ b/distribution/macos/create_macos_pr_build_ava.sh @@ -114,11 +114,6 @@ echo "Staging directory for packaging" DMG_FOLDER="$OUTPUT_DIRECTORY/dmg" mkdir "$DMG_FOLDER" -echo "" -echo "Checking exec perms..." -ls -l "$UNIVERSAL_APP_BUNDLE/Contents/MacOS/Ryujinx" -echo "" - tar -xzf "$BASE_DIRECTORY/distribution/macos/DMG_ASSETS/DMG_Structure.tar.gz" -C "$DMG_FOLDER" --strip-components=1 cp -R "$UNIVERSAL_APP_BUNDLE" "$DMG_FOLDER/Ryujinx.app" @@ -126,20 +121,6 @@ cp -R "$UNIVERSAL_APP_BUNDLE" "$DMG_FOLDER/Ryujinx.app" find "$DMG_FOLDER" -type d -exec chmod 0755 {} + find "$DMG_FOLDER" -type f -exec chmod 0644 {} + -find "$DMG_FOLDER" -mindepth 1 -type f | while IFS= read -r src; -do - dst="/${src#"$DMG_FOLDER"/}" - if file "$src" | grep -Fqi "Mach-O"; - then - chmod 0755 "$src" - fi -done - -echo "" -echo "Checking exec perms..." -ls -l "$DMG_FOLDER/Ryujinx.app/Contents/MacOS/Ryujinx" -echo "" - # Now sign it. echo "" echo "Signing .app" @@ -161,11 +142,6 @@ else spctl -a -vv "$DMG_FOLDER/Ryujinx.app" fi -echo "" -echo "Checking exec perms..." -ls -l "$DMG_FOLDER/Ryujinx.app/Contents/MacOS/Ryujinx" -echo "" - # Create archive for legacy releases. echo "" echo "Creating .app archive" @@ -201,25 +177,19 @@ find "$DMG_FOLDER" -mindepth 1 -type f | while IFS= read -r src; do dst="/${src#"$DMG_FOLDER"/}" dmg-hfsplus "$UNCOMPRESSED_DMG" add "$src" "$dst" + if [ "$dst" = "/Ryujinx.app/Contents/MacOS/Ryujinx" ] + then + dmg-hfsplus "$UNCOMPRESSED_DMG" chmod 0755 "$dst" + fi done -echo "" -echo "Checking exec perms..." -hfsplus "$UNCOMPRESSED_DMG" extract /Ryujinx.app/Content/MacOS/Ryujinx "$BASE_DIRECTORY/Ryujinx" -ls -l "$BASE_DIRECTORY/Ryujinx" -rm -f "$BASE_DIRECTORY/Ryujinx" -echo "" - # Copy the symlink into a folder, then copy the folder over with symlink permissions. # It doesn't like files that much. -if [[ -L "$DMG_FOLDER/Applications" ]]; -then - TEMP="$OUTPUT_DIRECTORY/temp" - mkdir -p "$TEMP" - cp -P "$DMG_FOLDER/Applications" "$TEMP" - dmg-hfsplus "$UNCOMPRESSED_DMG" -s clone_link addall "$TEMP" / - rm -rf "$TEMP" -fi +TEMP="$OUTPUT_DIRECTORY/temp" +mkdir -p "$TEMP" +cp -P "$DMG_FOLDER/Applications" "$TEMP" +dmg-hfsplus "$UNCOMPRESSED_DMG" -s clone_link addall "$TEMP" / +rm -rf "$TEMP" # https://developer.apple.com/library/archive/technotes/tn/tn1150.html # kHasCustomIcon