Skip to content

Commit 46d3056

Browse files
committed
fix whitespace probs - shfmt
1 parent ff65cf6 commit 46d3056

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

.github/autobuild/mac.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ prepare_signing() {
8888
# Remove default re-lock timeout to avoid codesign hangs:
8989
security set-keychain-settings build.keychain
9090
security unlock-keychain -p "${KEYCHAIN_PASSWORD}" build.keychain
91-
security import macos_certificate.p12 -k build.keychain -P "${MACOS_CERTIFICATE_PWD}" -A -T /usr/bin/codesign
91+
security import macos_certificate.p12 -k build.keychain -P "${MACOS_CERTIFICATE_PWD}" -A -T /usr/bin/codesign
9292
security import macapp_certificate.p12 -k build.keychain -P "${MAC_STORE_APP_CERT_PWD}" -A -T /usr/bin/codesign
93-
security import macinst_certificate.p12 -k build.keychain -P "${MAC_STORE_INST_CERT_PWD}" -A -T /usr/bin/productbuild
93+
security import macinst_certificate.p12 -k build.keychain -P "${MAC_STORE_INST_CERT_PWD}" -A -T /usr/bin/productbuild
9494
security set-key-partition-list -S apple-tool:,apple: -s -k "${KEYCHAIN_PASSWORD}" build.keychain
9595

9696
# Tell Github Workflow that we want signing
@@ -134,8 +134,7 @@ pass_artifact_to_job() {
134134
echo "artifact_1=${artifact}" >> "$GITHUB_OUTPUT"
135135

136136
artifact2="jamulus_${JAMULUS_BUILD_VERSION}_mac${ARTIFACT_SUFFIX:-}.pkg"
137-
for file in ./deploy/Jamulus_*.pkg
138-
do
137+
for file in ./deploy/Jamulus_*.pkg; do
139138
if [ -f "${file}" ]; then
140139
echo "Moving build artifact2 to deploy/${artifact2}"
141140
mv "${file}" "./deploy/${artifact2}"

mac/deploy_mac.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ build_app() {
114114

115115
# Add Qt deployment deps and codesign the app for App Store submission
116116
macdeployqt "${build_path}_storesign/${target_name}.app" -verbose=2 -always-overwrite -hardened-runtime -timestamp -appstore-compliant -sign-for-notarization="${macapp_cert_name}"
117-
117+
118118
# Create pkg installer and sign for App Store submission
119-
productbuild --sign "${macinst_cert_name}" --keychain build.keychain --component "${build_path}_storesign/${target_name}.app" /Applications "${build_path}/Jamulus_${JAMULUS_BUILD_VERSION}.pkg"
120-
119+
productbuild --sign "${macinst_cert_name}" --keychain build.keychain --component "${build_path}_storesign/${target_name}.app" /Applications "${build_path}/Jamulus_${JAMULUS_BUILD_VERSION}.pkg"
120+
121121
# move created pkg file to prep for download
122122
mv "${build_path}/Jamulus_${JAMULUS_BUILD_VERSION}.pkg" "${deploy_path}"
123123
fi
@@ -154,18 +154,18 @@ build_installer_image() {
154154
# Build installer image
155155

156156
create-dmg \
157-
--volname "${client_target_name} Installer" \
158-
--background "${resources_path}/installerbackground.png" \
159-
--window-pos 200 400 \
160-
--window-size 900 320 \
161-
--app-drop-link 820 210 \
162-
--text-size 12 \
163-
--icon-size 72 \
164-
--icon "${client_target_name}.app" 630 210 \
165-
--icon "${server_target_name}.app" 530 210 \
166-
--eula "${root_path}/COPYING" \
167-
"${deploy_path}/${client_target_name}-${JAMULUS_BUILD_VERSION}-installer-mac.dmg" \
168-
"${deploy_path}/"
157+
--volname "${client_target_name} Installer" \
158+
--background "${resources_path}/installerbackground.png" \
159+
--window-pos 200 400 \
160+
--window-size 900 320 \
161+
--app-drop-link 820 210 \
162+
--text-size 12 \
163+
--icon-size 72 \
164+
--icon "${client_target_name}.app" 630 210 \
165+
--icon "${server_target_name}.app" 530 210 \
166+
--eula "${root_path}/COPYING" \
167+
"${deploy_path}/${client_target_name}-${JAMULUS_BUILD_VERSION}-installer-mac.dmg" \
168+
"${deploy_path}/"
169169
}
170170

171171
brew_install_pinned() {

0 commit comments

Comments
 (0)