~ salmonella-environment-setup (master) d9f3375b7112d10f1781162ec571b74dca27aa27

commit d9f3375b7112d10f1781162ec571b74dca27aa27
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sun Dec 24 13:41:48 2017 +0100
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sun Dec 24 13:44:21 2017 +0100

    run-salmonella-linux.sh: add support for OS/ARCH-specific shell settings
    
    Load ("source") settings.sh from salmonella/$OS-common and
    salmonella/salmonella-$OS-$ARCH if they exist (in that order).

diff --git a/run-salmonella-linux.sh b/run-salmonella-linux.sh
index 85df428..1f48994 100755
--- a/run-salmonella-linux.sh
+++ b/run-salmonella-linux.sh
@@ -29,6 +29,15 @@ export LANG=C
 OS=$($CHICKEN_4_PREFIX/bin/csi -p '(software-version)')
 ARCH=$($CHICKEN_4_PREFIX/bin/csi -p '(machine-type)')
 
+# Load OS-specific settings
+[ -e "$SRC_DIR/salmonella/${OS}-common/settings.sh" ] && \
+    . "$SRC_DIR/salmonella/${OS}-common/settings.sh"
+
+# Load ARCH-specific settings
+[ -e "$SRC_DIR/salmonella/salmonella-${OS}-${ARCH}/settings.sh" ] && \
+    . "$SRC_DIR/salmonella/salmonella-${OS}-${ARCH}/settings.sh"
+
+
 main() {
     confs=$@
 
@@ -54,13 +63,6 @@ main() {
         sleep 1h
     done
 
-    ### Actually run salmonella
-    if [ "$ARCH" = "x86" ]; then
-        export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386/
-    elif [ "$ARCH" = "x86-64" ]; then
-        export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
-    fi
-
     # Remove leftovers from previous executions
     rm -rf salmonella-run-publish
 
diff --git a/salmonella-linux-x86-64/settings.sh b/salmonella-linux-x86-64/settings.sh
new file mode 100644
index 0000000..622262a
--- /dev/null
+++ b/salmonella-linux-x86-64/settings.sh
@@ -0,0 +1 @@
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
diff --git a/salmonella-linux-x86/settings.sh b/salmonella-linux-x86/settings.sh
new file mode 100644
index 0000000..0ce0406
--- /dev/null
+++ b/salmonella-linux-x86/settings.sh
@@ -0,0 +1 @@
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386/