~ salmonella-environment-setup (master) 242a2f7204e0634a11729322e51315c2042dc6ca

commit 242a2f7204e0634a11729322e51315c2042dc6ca
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Thu Jan 5 21:08:18 2017 +0100
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Thu Jan 5 21:08:18 2017 +0100

    salmonella-linux-x84/run-salmonella.sh: argvector support & branches cleanup
    
    Finally commit old changes that were not commited in the salmonella
    machine.  Add support for argvector builds and clean up some branches.

diff --git a/salmonella-linux-x86/run-salmonella.sh b/salmonella-linux-x86/run-salmonella.sh
index f761a6c..7bf721e 100755
--- a/salmonella-linux-x86/run-salmonella.sh
+++ b/salmonella-linux-x86/run-salmonella.sh
@@ -25,13 +25,18 @@ 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 prerelease master-clang stability master; do
+for branch in master-debugbuild chicken-5; 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
@@ -41,3 +46,17 @@ for branch in master-debugbuild chicken-5 prerelease master-clang stability mast
     DEBUGBUILD=$debugbuild salmonella-run-publish ~/src/chicken-infrastructure/salmonella/salmonella-linux-x86/${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/${branch}.conf
+    mv salmonella-run-publish salmonella-$branch
+done