Skip to content

Commit 59f0518

Browse files
Merge pull request #10 from secondlife/gh-edu
Make sign-pkg-mac copy whatever .app it finds in the artifact.
2 parents f6fae4b + 2e9c225 commit 59f0518

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

sign-pkg-mac/action.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,13 @@ runs:
5454
id: unpack
5555
shell: bash
5656
run: |
57-
if [[ "${{ inputs.channel }}" == "${{ inputs.channel_vendor_base }} Release" ]]
58-
then app_name="${{ inputs.channel_vendor_base }} Viewer"
59-
else app_name="${{ inputs.channel }}"
60-
fi
61-
echo "app_name=$app_name" >> "$GITHUB_OUTPUT"
6257
set -x
6358
mkdir -p ".app"
6459
tar xjf .tarball/* -C ".app"
6560
6661
- name: Set up the app sparseimage
6762
shell: bash
6863
run: |
69-
app_name="${{ steps.unpack.outputs.app_name }}"
7064
set -x -e
7165
# MBW -- If the mounted volume name changes, it breaks the .DS_Store's
7266
# background image and icon positioning. If we really need
@@ -111,8 +105,10 @@ runs:
111105
done
112106
113107
# don't forget the application itself
114-
cp -a ".app/$app_name.app" "$volpath/"
115-
echo "app_path=$volpath/$app_name.app" >> "$GITHUB_ENV"
108+
artifact_app="$(ls -dt .app/*.app | head -n 1)"
109+
cp -a "$artifact_app" "$volpath/"
110+
app_name="$(basename "$artifact_app")"
111+
echo "app_path=$volpath/$app_name" >> "$GITHUB_ENV"
116112
117113
# Create the alias file (which is a resource file) from the .r
118114
Rez "$dmg_prefill/Applications-alias.r" -o "$volpath/Applications"

0 commit comments

Comments
 (0)