Skip to content

Commit 6952286

Browse files
pinhead84pinhead84
committed
update macOS application bundles
(cherry picked from commit 1d1d04e)
1 parent 0ee0c13 commit 6952286

7 files changed

Lines changed: 14 additions & 18 deletions

File tree

‎release/bundle-macos.sh‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ if [[ -d "$TARGET_DIR/Staff/macos-x86-64" ]]; then
3636
rm -Rf "$TARGET_DIR/$STAFF_TOOL.app"
3737
rm -f "$TARGET_DIR/$STAFF_TOOL-$VERSION.macos-x86-64.tar.gz"
3838
cp -R "$DIR/src/macos/Staff.app" "$TARGET_DIR/$STAFF_TOOL.app"
39-
mkdir -p "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns"
40-
cp -R "$TARGET_DIR/Staff/macos-x86-64" "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns/runtime"
41-
mv "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns/runtime/legal" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Resources"
42-
mv "$TARGET_DIR/$STAFF_TOOL.app/Contents/PlugIns/runtime/LICENSE.txt" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Resources"
39+
mkdir -p "$TARGET_DIR/$STAFF_TOOL.app/Contents"
40+
cp -R "$TARGET_DIR/Staff/macos-x86-64" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Resources"
4341
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$STAFF_TOOL.app/Contents/Info.plist"
4442
cd "$TARGET_DIR"
4543
tar cfz "$STAFF_TOOL-$VERSION.macos-x86-64.tar.gz" "$STAFF_TOOL.app"
@@ -58,10 +56,8 @@ if [[ -d "$TARGET_DIR/Customer/macos-x86-64" ]]; then
5856
rm -Rf "$TARGET_DIR/$CUSTOMER_TOOL.app"
5957
rm -f "$TARGET_DIR/$CUSTOMER_TOOL-$VERSION.macos-x86-64.tar.gz"
6058
cp -R "$DIR/src/macos/Customer.app" "$TARGET_DIR/$CUSTOMER_TOOL.app"
61-
mkdir -p "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns"
62-
cp -R "$TARGET_DIR/Customer/macos-x86-64" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns/runtime"
63-
mv "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns/runtime/legal" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Resources"
64-
mv "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/PlugIns/runtime/LICENSE.txt" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Resources"
59+
mkdir -p "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents"
60+
cp -R "$TARGET_DIR/Customer/macos-x86-64" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Resources"
6561
sed -i -e "s/{VERSION}/$VERSION/g" "$TARGET_DIR/$CUSTOMER_TOOL.app/Contents/Info.plist"
6662
cd "$TARGET_DIR"
6763
tar cfz "$CUSTOMER_TOOL-$VERSION.macos-x86-64.tar.gz" "$CUSTOMER_TOOL.app"

‎release/src/macos/Customer.app/Contents/Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<string>APPL</string>
2222

2323
<key>CFBundleExecutable</key>
24-
<string>CustomerSupportTool.sh</string>
24+
<string>Start.sh</string>
2525

2626
<key>CFBundleIconFile</key>
27-
<string>CustomerSupportTool.icns</string>
27+
<string>share/icon.icns</string>
2828

2929
<key>CFBundleDevelopmentRegion</key>
3030
<string>en-US</string>
@@ -33,7 +33,7 @@
3333
<string>public.app-category.utilities</string>
3434

3535
<key>LSMinimumSystemVersion</key>
36-
<string>10.7.3</string>
36+
<string>10.9</string>
3737

3838
<key>NSHumanReadableCopyright</key>
3939
<string>©2015-2019 OpenIndex.de</string>

release/src/macos/Customer.app/Contents/MacOS/CustomerSupportTool.sh renamed to release/src/macos/Customer.app/Contents/MacOS/Start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22
# ----------------------------------------------------------------------------
3-
# RemoteSupportTool for customers
3+
# Start CustomerSupportTool
44
# Copyright 2015-2019 OpenIndex.de
55
# ----------------------------------------------------------------------------
66

77
SCRIPT_DIR=$( cd $( dirname ${BASH_SOURCE[0]} ) && pwd )
88
CONTENTS_DIR=$( cd $( dirname ${SCRIPT_DIR} ) && pwd )
9-
START_SH="$CONTENTS_DIR/PlugIns/runtime/bin/Start.sh"
9+
START_SH="$CONTENTS_DIR/Resources/bin/Start.sh"
1010
exec ${START_SH}

‎release/src/macos/Customer.app/Contents/Resources/CustomerSupportTool.icns‎

-139 KB
Binary file not shown.

‎release/src/macos/Staff.app/Contents/Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<string>APPL</string>
2222

2323
<key>CFBundleExecutable</key>
24-
<string>StaffSupportTool.sh</string>
24+
<string>Start.sh</string>
2525

2626
<key>CFBundleIconFile</key>
27-
<string>StaffSupportTool.icns</string>
27+
<string>share/icon.icns</string>
2828

2929
<key>CFBundleDevelopmentRegion</key>
3030
<string>en-US</string>
@@ -33,7 +33,7 @@
3333
<string>public.app-category.utilities</string>
3434

3535
<key>LSMinimumSystemVersion</key>
36-
<string>10.7.3</string>
36+
<string>10.9</string>
3737

3838
<key>NSHumanReadableCopyright</key>
3939
<string>©2015-2019 OpenIndex.de</string>

release/src/macos/Staff.app/Contents/MacOS/StaffSupportTool.sh renamed to release/src/macos/Staff.app/Contents/MacOS/Start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22
# ----------------------------------------------------------------------------
3-
# RemoteSupportTool for staff members
3+
# Start StaffSupportTool
44
# Copyright 2015-2019 OpenIndex.de
55
# ----------------------------------------------------------------------------
66

77
SCRIPT_DIR=$( cd $( dirname ${BASH_SOURCE[0]} ) && pwd )
88
CONTENTS_DIR=$( cd $( dirname ${SCRIPT_DIR} ) && pwd )
9-
START_SH="$CONTENTS_DIR/PlugIns/runtime/bin/Start.sh"
9+
START_SH="$CONTENTS_DIR/Resources/bin/Start.sh"
1010
exec ${START_SH}

‎release/src/macos/Staff.app/Contents/Resources/StaffSupportTool.icns‎

-121 KB
Binary file not shown.

0 commit comments

Comments
 (0)