Cleanup

Signed-off-by: falkTX <falktx@falktx.com>

.travis/before_install.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "${TARGET}" = "macos" ]; then
+if [ "${TARGET}" = "macos" ] || [ "${TARGET}" = "macos-universal" ]; then
     exit 0
 fi
 

build.sh

@@ -14,12 +14,7 @@ if [ -z "${target}" ]; then
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
-
-pushd PawPaw
-source local.env ${target}
-popd
-
-# ---------------------------------------------------------------------------------------------------------------------
+# check if building from scratch
 
 if [ -e ${PAWPAW_BUILDDIR}/.last-bootstrap-version ]; then
     LAST_BOOTSTRAP_VERSION=$(cat ${PAWPAW_BUILDDIR}/.last-bootstrap-version)
@@ -31,19 +26,30 @@ mkdir -p ${PAWPAW_BUILDDIR}
 echo ${BOOTSTRAP_VERSION} > ${PAWPAW_BUILDDIR}/.last-bootstrap-version
 
 # ---------------------------------------------------------------------------------------------------------------------
-
 # stop at qt build if bootstrap environment starts from scratch
+
 if [ ${LAST_BOOTSTRAP_VERSION} -ne ${BOOTSTRAP_VERSION} ]; then
     ${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-qt.sh ${TARGET}
     ${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}
     exit 0
 fi
 
+# ---------------------------------------------------------------------------------------------------------------------
 # build dependencies
+
 ${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-carla.sh ${TARGET}
 ${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}
 
+# ---------------------------------------------------------------------------------------------------------------------
+# import PawPaw environment
+
+pushd PawPaw
+source local.env ${target}
+popd
+
+# ---------------------------------------------------------------------------------------------------------------------
 # build and package carla
+
 pushd Carla
 make features
 make EXTERNAL_PLUGINS=false ${MAKE_ARGS}