9 files changed, 26 insertions, 10 deletions
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
deleted file mode 100755
index b05dcf1c..00000000
--- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh
index ba8dbdd3..8461c656 100644..100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh
@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh
new file mode 100755
index 00000000..94b53309
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh
index 44df94e7..e799344a 100644..100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 mkdir -p $HOME/Library/LaunchAgents
 cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh
index 0fbe7628..2c3e45f3 100644..100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 # Read .bashrc if exist
 printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
index ddb01d64..e5dd1910 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
+$BASEDIR/../common/macos/cmake.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
index d257ffa1..fea11e01 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 # There is only one mac package and common script uses it as a default
-$BASEDIR/../common/libclang.sh
+$BASEDIR/../common/unix/libclang.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh
new file mode 100755
index 00000000..92b05bf3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"