~ salmonella-environment-setup (master) 7b9b58237df9f6b24f0f3434a2190e12d6e7861b

commit 7b9b58237df9f6b24f0f3434a2190e12d6e7861b
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sun May 27 00:48:40 2018 +0200
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sun May 27 00:48:40 2018 +0200

    run-salmonella.sh: remove `salmonella' directory from paths
    
    After we moved the salmonella directory out of the
    chicken-infrastructure repo, the `salmonella' directory doesn't exist
    anymore.

diff --git a/run-salmonella.sh b/run-salmonella.sh
index 9ab8c54..3044573 100755
--- a/run-salmonella.sh
+++ b/run-salmonella.sh
@@ -24,8 +24,8 @@ ARCH=$($CHICKEN_4_PREFIX/bin/csi -p '(machine-type)')
 
 # FIXME: make it an array
 settings_files="\
-    $SRC_DIR/salmonella/conf/shell-settings/${OS}/settings.sh
-    $SRC_DIR/salmonella/conf/shell-settings/${OS}-${ARCH}/settings.sh
+    $SRC_DIR/conf/shell-settings/${OS}/settings.sh
+    $SRC_DIR/conf/shell-settings/${OS}-${ARCH}/settings.sh
 "
 
 for settings_file in $settings_file; do
@@ -41,7 +41,7 @@ main() {
 
     # Check if all conf files exist
     for conf in $confs; do
-        if [ ! -e "$SRC_DIR/salmonella/conf/${conf}.conf" ]; then
+        if [ ! -e "$SRC_DIR/conf/${conf}.conf" ]; then
             echo "No configuration file found for '$conf'.  Aborting." >&2
             exit 1
         fi
@@ -79,7 +79,7 @@ main() {
             debugbuild=
         fi
 
-        conf_path=$SRC_DIR/salmonella/conf/${conf}.conf
+        conf_path=$SRC_DIR/conf/${conf}.conf
         DEBUGBUILD=$debugbuild "$CHICKEN_4_PREFIX/bin/salmonella-run-publish" "$conf_path"
         mv salmonella-run-publish "salmonella-$conf"
     done