Merge pull request #21 from mfojtik/bash-env

Remove bashrc sourcing in STI scripts

5.5/.sti/bin/assemble

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ./.bashrc
-
 set -e
 
 echo "---> Installing application source"

5.5/.sti/bin/run

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# For SCL enablement
-source ./.bashrc
-
 # Default php.ini configuration values, all taken 
 # from php defaults.
 export ERROR_REPORTING=${ERROR_REPORTING:-E_ALL & ~E_NOTICE}

5.5/contrib/src/.bashrc

@@ -1,2 +1,6 @@
+# IMPORTANT: Do not add more content to this file unless you know what you are
+#            doing. This file is sourced everytime the shell session is opened.
+#
 # This will make scl collection binaries work out of box.
+unset BASH_ENV
 source scl_source enable php55 httpd24

Makefile

@@ -13,9 +13,9 @@ endif
 
 .PHONY: build
 build:
-	hack/build.sh $(OS) $(VERSION)
+	SKIP_SQUASH=$(SKIP_SQUASH) hack/build.sh $(OS) $(VERSION)
 
 
 .PHONY: test
 test:
-	TEST_MODE=true hack/build.sh $(OS) $(VERSION)
+	SKIP_SQUASH=1 TEST_MODE=true hack/build.sh $(OS) $(VERSION)

hack/build.sh

@@ -29,7 +29,9 @@ function docker_build {
   fi
 
   docker build -t ${TAG} . && trap - ERR
-  squash
+  [ -z "${SKIP_SQUASH}" ] && squash
+
+  return 0
 }
 
 if [ -z ${VERSION} ]; then