~ salmonella-environment-setup (master) 87ab7e23dca7cb94feda6466ca6f4fcbc000bd54

commit 87ab7e23dca7cb94feda6466ca6f4fcbc000bd54
Author:     Mario Domenech Goulart <mario.goulart@gmail.com>
AuthorDate: Sun Sep 6 23:07:53 2015 +0200
Commit:     Mario Domenech Goulart <mario.goulart@gmail.com>
CommitDate: Sun Sep 6 18:06:27 2015 -0300

    salmonella-linux-x86-64: run-salmonella.sh: support argvector

diff --git a/salmonella-linux-x86-64/run-salmonella.sh b/salmonella-linux-x86-64/run-salmonella.sh
index 8fa67f9..cc5e1bb 100755
--- a/salmonella-linux-x86-64/run-salmonella.sh
+++ b/salmonella-linux-x86-64/run-salmonella.sh
@@ -21,19 +21,23 @@ done
 ### Actually run salmonella
 ###
 
-export PATH=$HOME/local/chicken/bin:$PATH
 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
 export BVSPIS_PATH=/usr/local/bvspis
 export LC_ALL=C
 export LANG=C
 
-# The inline egg writes some stuff to the home dir
-rm -rf ~/.chicken-inline
-
 rm -rf salmonella-run-publish
 
+#
+# argvector chickens
+#
+export PATH=$HOME/local/chicken-argvector/bin:$PATH
+
 debugbuild=
-for branch in master-debugbuild chicken-5 master-clang stability master prerelease; do
+for branch in master-debugbuild chicken-5 master-clang master; do
+    # The inline egg writes some stuff to the home dir
+    rm -rf ~/.chicken-inline
+
     rm -rf salmonella-$branch
     if [ "$branch" = "master-debugbuild" ]; then
 	debugbuild=1
@@ -43,3 +47,17 @@ for branch in master-debugbuild chicken-5 master-clang stability master prerelea
     DEBUGBUILD=$debugbuild salmonella-run-publish ~/src/chicken-infrastructure/salmonella/salmonella-linux-x86-64/${branch}.conf
     mv salmonella-run-publish salmonella-$branch
 done
+
+#
+# no-argvector chickens
+#
+export PATH=$HOME/local/chicken/bin:$PATH
+
+for branch in prerelease stability; do
+    # The inline egg writes some stuff to the home dir
+    rm -rf ~/.chicken-inline
+
+    rm -rf salmonella-$branch
+    salmonella-run-publish ~/src/chicken-infrastructure/salmonella/salmonella-linux-x86-64/${branch}.conf
+    mv salmonella-run-publish salmonella-$branch
+done