diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-22 12:45:50 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-22 12:45:50 +0200 |
| commit | 3ea6e51b28a06ad4c8b70e9f4d206a56e4771027 (patch) | |
| tree | fa51f54b2ed460b5544ac0153389d1380e991189 /etc/bootstrap | |
| parent | 1fc77270c6af777adb80e1df917da7dc36c75d14 (diff) | |
Rename directory/option environment to environments
To be consistent with machines/ and toolchains/
Diffstat (limited to 'etc/bootstrap')
| -rwxr-xr-x | etc/bootstrap/bbot-bootstrap-macos.sh | 2 | ||||
| -rw-r--r-- | etc/bootstrap/bbot-bootstrap-msvc.bat | 4 | ||||
| -rw-r--r-- | etc/bootstrap/bbot-bootstrap.service | 4 | ||||
| -rwxr-xr-x | etc/bootstrap/bbot-bootstrap.sh | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh index e0a8ac7..8fee3b9 100755 --- a/etc/bootstrap/bbot-bootstrap-macos.sh +++ b/etc/bootstrap/bbot-bootstrap-macos.sh @@ -3,7 +3,7 @@ # open -a Terminal -n -F ~/bbot-bootstrap-macos.sh if ~/bbot-bootstrap.sh --cxx clang++ --build /tmp \ - --environment "$HOME/environment"; then + --environments "$HOME/environments"; then sleep 2 sudo shutdown -h now fi diff --git a/etc/bootstrap/bbot-bootstrap-msvc.bat b/etc/bootstrap/bbot-bootstrap-msvc.bat index 4b60f5d..b502c7b 100644 --- a/etc/bootstrap/bbot-bootstrap-msvc.bat +++ b/etc/bootstrap/bbot-bootstrap-msvc.bat @@ -12,7 +12,7 @@ set "VCVARS=%MSVC%\VC\Auxiliary\Build\vcvars64.bat" set "BUILD=C:\tmp" set "INSTALL=C:\build2" set "BOOTSTRAP=C:\bootstrap" -set "ENVIRONMENT=C:\environment" +set "ENVIRONMENTS=C:\environments" set "TFTP=196.254.111.222" rem set "TFTP=10.1.0.1:55123" @@ -22,7 +22,7 @@ rem If we already have the bbot worker, assume we are bootstrapped. rem if exist %INSTALL%\bin\bbot-worker.exe ( set "PATH=%INSTALL%\bin;%PATH%" - bbot-worker.exe --startup --build %BUILD% --environment %ENVIRONMENT%^ + bbot-worker.exe --startup --build %BUILD% --environments %ENVIRONMENTS%^ --tftp-host %TFTP% --verbose %VERBOSE% goto end ) diff --git a/etc/bootstrap/bbot-bootstrap.service b/etc/bootstrap/bbot-bootstrap.service index ecb0da4..8ff2aab 100644 --- a/etc/bootstrap/bbot-bootstrap.service +++ b/etc/bootstrap/bbot-bootstrap.service @@ -15,12 +15,12 @@ WorkingDirectory=/home/build Environment=CXX=g++ Environment=BUILD=/tmp -Environment=ENVIRONMENT=/home/build/environment +Environment=ENVIRONMENTS=/home/build/environments ExecStart=/usr/local/bin/bbot-bootstrap.sh \ --cxx ${CXX} \ --build ${BUILD} \ - --environment ${ENVIRONMENT} + --environments ${ENVIRONMENTS} StandardInput=tty-force StandardOutput=inherit diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh index 9473abe..9e7ace8 100755 --- a/etc/bootstrap/bbot-bootstrap.sh +++ b/etc/bootstrap/bbot-bootstrap.sh @@ -35,7 +35,7 @@ run () # cxx=g++ build=/tmp -environment="$HOME/environment" +environments="$HOME/environments" # Parse options. # @@ -57,12 +57,12 @@ while test $# -ne 0; do build="$1" shift ;; - --environment) + --environments) shift if test $# -eq 0; then - error "missing environment directory after --environment" + error "missing environments directory after --environments" fi - environment="$1" + environments="$1" shift ;; *) @@ -90,7 +90,7 @@ export PATH # If we already have the bbot worker, assume we are bootstrapped. # if bbot-worker --version >/dev/null 2>&1; then - exec bbot-worker --startup --build "$build" --environment "$environment" \ + exec bbot-worker --startup --build "$build" --environments "$environments" \ --tftp-host "$tftp" --verbose "$verbose" fi |