~ salmonella-environment-setup (master) ebd269b8b172c78dcf683bb5f6c0a4ff22293adb
commit ebd269b8b172c78dcf683bb5f6c0a4ff22293adb Author: Mario Domenech Goulart <mario@parenteses.org> AuthorDate: Sat May 26 13:24:32 2018 +0200 Commit: Mario Domenech Goulart <mario@parenteses.org> CommitDate: Sat May 26 13:24:32 2018 +0200 README, run-salmonella.sh: adapt hardcoded paths s/chicken-infrastructure/salmonella-environment-setup/ diff --git a/README b/README index 7a02b4b..d9e5c50 100644 --- a/README +++ b/README @@ -39,8 +39,8 @@ The following CHICKEN tools are required The following directory layout is assumed by run-salmonella.sh (see "Initial setup" for more details): -$HOME/src/chicken-infrastructure - Clone of the chicken-infrastructure repository +$HOME/src/salmonella-environment-setup + Clone of the salmonella-environment-setup repository $HOME/local/chicken CHICKEN 4 installation directory @@ -126,8 +126,8 @@ $ $HOME/local/chicken-5/bin/chicken-install == Configuring salmonella jobs run-salmonella.sh will look for configuration files in the -chicken-infrastructure repository, specifically in -$HOME/src/chicken-infrastructure/salmonella/conf +salmonella-environment-setup repository, specifically in +$HOME/src/salmonella-environment-setup/conf run-salmonella.sh will look for configuration files with .conf suffix in that directory. The conf files are Scheme files that usually set @@ -140,8 +140,8 @@ to set environment variables. run-salmonella.sh will look for settings files in the following directories, according to the following order: -* $HOME/src/chicken-infrastructure/salmonella/conf/shell-settings/${OS} -* $HOME/src/chicken-infrastructure/salmonella/conf/shell-settings/${OS}-${ARCH} +* $HOME/src/salmonella-environment-setup/conf/shell-settings/${OS} +* $HOME/src/salmonella-environment-setup/conf/shell-settings/${OS}-${ARCH} Where ${OS} is the value returned by (software-version) and ${ARCH} is the value returned by (machine-type) by CHICKEN. @@ -154,7 +154,7 @@ After you've got everything installed and configured, you can call run-salmonella.sh with the configuration file names (without extension) as arguments. Example: - $HOME/src/chicken-infrastructure/salmonella/run-salmonella.sh chicken-4 chicken-5 + $HOME/src/salmonella-environment-setup/run-salmonella.sh chicken-4 chicken-5 This will make run-salmonella.sh pick the chicken-4.conf and chicken-5.conf files and shell settings files for ${OS} and ${ARCH}. diff --git a/run-salmonella.sh b/run-salmonella.sh index f9e19ea..9ab8c54 100755 --- a/run-salmonella.sh +++ b/run-salmonella.sh @@ -9,7 +9,7 @@ Usage: $(basename "$0") <confs> EOF } -SRC_DIR=$HOME/src/chicken-infrastructure +SRC_DIR=$HOME/src/salmonella-environment-setup WORK_DIR=$HOME/salmonella/build LOG_DIR=$HOME/salmonellaTrap