Merge pull request #823 from DDRBoxman/patch-5

CI: Add some logging to the before deploy script on OSX

CI/before-deploy-osx.sh

@@ -1,3 +1,12 @@
+hr() {
+  local start=$'\e(0' end=$'\e(B' line='qqqqqqqqqqqqqqqq'
+  local cols=${COLUMNS:-$(tput cols)}
+  while ((${#line} < cols)); do line+="$line"; done
+  printf '%s%s%s\n' "$start" "${line:0:cols}" "$end"
+  echo $1
+  printf '%s%s%s\n' "$start" "${line:0:cols}" "$end"
+}
+
 # Exit if something fails
 set -e
 
@@ -9,28 +18,37 @@ export FILENAME=$FILE_DATE-$GIT_HASH-osx.pkg
 cd ./build
 
 # Move the CEF plugin out before running build_app so that it doesn't get packaged twice
+hr "Moving CEF out to preserve linking"
 mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./
 mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./
 
 # Package everything into a nice .app
+hr "Packaging .app"
 sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework #--base-url=https://obsappcasturlhere
 
 # Move the CEF plugin back to where it belongs
+hr "Moving CEF back"
 mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/
 mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/
 
 # Package app
+hr "Generating .pkg"
 packagesbuild ../CI/install/osx/CMakeLists.pkgproj
 
 # Signing stuff
+hr "Decrypting Cert"
 openssl aes-256-cbc -K $encrypted_dd3c7f5e9db9_key -iv $encrypted_dd3c7f5e9db9_iv -in ../CI/osxcert/Certificates.p12.enc -out Certificates.p12 -d
+hr "Creating Keychain"
 security create-keychain -p mysecretpassword build.keychain
 security default-keychain -s build.keychain
 security unlock-keychain -p mysecretpassword build.keychain
 security set-keychain-settings -t 3600 -u build.keychain
+hr "Importing certs into keychain"
 security import Certificates.p12 -k build.keychain -T /usr/bin/productsign
+hr "Signing Package"
 productsign --sign 'Developer ID Installer: Hugh Bailey (2MMRE5MTB8)' ./OBS.pkg ./$FILENAME
 
 # Move to the folder that travis uses to upload artifacts from
+hr "Moving package to nightly folder for distribution"
 mkdir ../nightly
 sudo mv ./$FILENAME ../nightly