GHA: correct notarization script, cleanup. Define KEYCHAIN var in scripts

.github/scripts/notarize-osx-distro-file.sh

@@ -1,7 +1,8 @@
 # Takes a DMG file as parameter
 set -e
 
-$dmg_file=$1
+dmg_file=$1
+notarize_profile=$2
 dmg_filename="$(basename -- $dmg_file)"
 dir="$(dirname "$dmg_file")"
 
@@ -9,7 +10,7 @@ echo "****************************************************************"
 echo "*** Notarizing: ${dmg_filename}"
 echo "****************************************************************"
 cd $dir
-xcrun notarytool submit ./${dmg_filename} --keychain-profile notarize-app-dmg-profile --wait
+xcrun notarytool submit ./${dmg_filename} --keychain-profile $notarize_profile --wait
 echo "Staple and generate checksums for ${dmg_filename}"
 xcrun stapler staple $dmg_filename
 shasum -a 256 $dmg_filename > ${dmg_filename}.sha256

.github/scripts/sign-osx-distro-file.sh

@@ -16,9 +16,7 @@ mkdir ${dir}/${destination_folder_name}
 tar -zxf $file --directory ${dir}/${destination_folder_name}
 echo "Successfully extracted ${filename}"
 echo "About to sign OSX .app file: ${dir}/${destination_folder_name}/SpringToolSuite4.app"
-ls ${dir}/${destination_folder_name}
 echo "keychain ${KEYCHAIN}"
-echo "entitlements ${entitlements}"
 codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
 
 cd ${dir}/${destination_folder_name}
@@ -37,11 +35,8 @@ cat ./dmg-config.json
 dmg_filename=${filename%.*.*}.dmg
 appdmg ./dmg-config.json ../${dmg_filename}
 cd ..
-pwd
-ls
 rm -rf ./${destination_folder_name}
 rm -f $filename
 
 echo "Sign ${dmg_filename}"
-echo 'codesign --verbose --deep --force --timestamp --keychain "'${KEYCHAIN}'" -s "'${MACOS_CERTIFICATE_ID}'" ./$dmg_filename'
 codesign --verbose --deep --force --timestamp --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ./$dmg_filename