Skip to content

Commit f0746a8

Browse files
pinhead84pinhead84
committed
update scripts for macOS bundles
1 parent 1901d33 commit f0746a8

2 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎release/bundle-mac.sh‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,40 +28,40 @@ if [ -d "$TARGET_DIR/Staff/mac64" ]; then
2828
FOUND="1"
2929
echo ""
3030
echo "----------------------------------------------------------------"
31-
echo "Creating $STAFF_TOOL-$VERSION.app..."
31+
echo "Creating $STAFF_TOOL-$VERSION-mac.tar.gz..."
3232
echo "----------------------------------------------------------------"
3333
echo ""
34-
rm -Rf "$TARGET_DIR/$STAFF_TOOL-$VERSION.app"
35-
rm -f "$TARGET_DIR/$STAFF_TOOL-$VERSION.app.tar.gz"
36-
cp -R "$DIR/src/macos/Staff.app" "$TARGET_DIR/$STAFF_TOOL-$VERSION.app"
37-
mkdir -p "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/PlugIns"
38-
cp -R "$TARGET_DIR/Staff/mac64" "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/PlugIns/runtime"
39-
mv "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/PlugIns/runtime/legal" "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/Resources"
40-
mv "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/PlugIns/runtime/LICENSE.txt" "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/Resources"
41-
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$STAFF_TOOL-$VERSION.app/Contents/Info.plist"
34+
rm -Rf "$TARGET_DIR/$STAFF_TOOL.app"
35+
rm -f "$TARGET_DIR/$STAFF_TOOL-$VERSION-mac.tar.gz"
36+
cp -R "$DIR/src/macos/Staff.app" "$TARGET_DIR/$STAFF_TOOL.app"
37+
mkdir -p "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns"
38+
cp -R "$TARGET_DIR/Staff/mac64" "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns/runtime"
39+
mv "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns/runtime/legal" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Resources"
40+
mv "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns/runtime/LICENSE.txt" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Resources"
41+
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Info.plist"
4242
cd "$TARGET_DIR"
43-
tar cfz "$STAFF_TOOL-$VERSION.app.tar.gz" "$STAFF_TOOL-$VERSION.app"
44-
rm -Rf "$TARGET_DIR/$STAFF_TOOL-$VERSION.app"
43+
tar cfz "$STAFF_TOOL-$VERSION-mac.tar.gz" "$STAFF_TOOL.app"
44+
rm -Rf "$TARGET_DIR/$STAFF_TOOL.app"
4545
fi
4646

4747
if [ -d "$TARGET_DIR/Customer/mac64" ]; then
4848
FOUND="1"
4949
echo ""
5050
echo "----------------------------------------------------------------"
51-
echo "Creating $CUSTOMER_TOOL-$VERSION.app..."
51+
echo "Creating $CUSTOMER_TOOL-$VERSION-mac.tar.gz..."
5252
echo "----------------------------------------------------------------"
5353
echo ""
54-
rm -Rf "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app"
55-
rm -f "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app.tar.gz"
56-
cp -R "$DIR/src/macos/Customer.app" "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app"
57-
mkdir -p "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/PlugIns"
58-
cp -R "$TARGET_DIR/Customer/mac64" "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/PlugIns/runtime"
59-
mv "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/PlugIns/runtime/legal" "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/Resources"
60-
mv "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/PlugIns/runtime/LICENSE.txt" "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/Resources"
61-
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app/Contents/Info.plist"
54+
rm -Rf "$TARGET_DIR/$CUSTOMER_TOOL.app"
55+
rm -f "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION-mac.tar.gz"
56+
cp -R "$DIR/src/macos/Customer.app" "$TARGET_DIR/$CUSTOMER_TOOL.app"
57+
mkdir -p "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns"
58+
cp -R "$TARGET_DIR/Customer/mac64" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns/runtime"
59+
mv "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns/runtime/legal" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Resources"
60+
mv "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns/runtime/LICENSE.txt" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Resources"
61+
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Info.plist"
6262
cd "$TARGET_DIR"
63-
tar cfz "$CUSTOMER_TOOL-$VERSION.app.tar.gz" "$CUSTOMER_TOOL-$VERSION.app"
64-
rm -Rf "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.app"
63+
tar cfz "$CUSTOMER_TOOL-$VERSION-mac.tar.gz" "$CUSTOMER_TOOL.app"
64+
rm -Rf "$TARGET_DIR/$CUSTOMER_TOOL.app"
6565
fi
6666

6767
if [ "$FOUND" == "0" ]; then

‎release/codesign-mac.sh‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set -e
3232
mkdir -p "$SIGNED_DIR"
3333
export LANG="en_US.UTF-8"
3434

35-
for f in ${TARGET_DIR}/*.app.tar.gz; do
35+
for f in ${TARGET_DIR}/*-mac.tar.gz; do
3636

3737
if [ "$FOUND" == "0" ]; then
3838
echo ""
@@ -44,27 +44,26 @@ for f in ${TARGET_DIR}/*.app.tar.gz; do
4444
fi
4545

4646
FOUND="1"
47-
#pkg=$(basename ${f:0:-7})
48-
pkg=$(basename ${f%.tar.gz})
47+
pkg="$(basename "$f" | rev | cut -d'-' -f3- | rev)"
4948
echo ""
5049
echo "----------------------------------------------------------------"
51-
echo "Signing $pkg..."
50+
echo "Signing $pkg.app..."
5251
echo "----------------------------------------------------------------"
5352
echo ""
54-
rm -Rf "$TARGET_DIR/$pkg"
53+
rm -Rf "$TARGET_DIR/$pkg.app"
5554
tar xfz "$f" -C "$TARGET_DIR"
56-
codesign --deep -s "$KEY" "$TARGET_DIR/$pkg"
55+
codesign --deep -s "$KEY" "$TARGET_DIR/$pkg.app"
5756
echo "Verifying signature:"
58-
codesign -d --verbose=4 "$TARGET_DIR/$pkg"
57+
codesign -d --verbose=4 "$TARGET_DIR/$pkg.app"
5958
echo ""
6059
echo "Verifying access for Gatekeeper:"
61-
spctl --assess --verbose=4 --type execute "$TARGET_DIR/$pkg"
60+
spctl --assess --verbose=4 --type execute "$TARGET_DIR/$pkg.app"
6261
echo ""
6362
echo "Storing signed application bundle at:"
64-
echo "$SIGNED_DIR/$pkg.tar.gz"
65-
rm -f "$SIGNED_DIR/$pkg.tar.gz"
63+
echo "$SIGNED_DIR/$(basename "$f")"
64+
rm -f "$SIGNED_DIR/$(basename "$f")"
6665
cd "$TARGET_DIR"
67-
tar cfz "$SIGNED_DIR/$pkg.tar.gz" "$pkg"
66+
tar cfz "$SIGNED_DIR/$(basename "$f")" "$pkg.app"
6867
done
6968

7069
if [ "$FOUND" == "0" ]; then

0 commit comments

Comments
 (0)