9 files changed, 43 insertions, 14 deletions
diff --git a/etc/bootstrap/bbot-bootstrap-clang.bat b/etc/bootstrap/bbot-bootstrap-clang.bat
index 79c4009..99124e9 100644
--- a/etc/bootstrap/bbot-bootstrap-clang.bat
+++ b/etc/bootstrap/bbot-bootstrap-clang.bat
@@ -1,7 +1,7 @@
 @echo off
 
 rem file      : etc/bootstrap/bbot-bootstrap-clang.bat
-rem license   : TBC; see accompanying LICENSE file
+rem license   : MIT; see accompanying LICENSE file
 
 setlocal EnableExtensions EnableDelayedExpansion
 
@@ -52,7 +52,9 @@ rem See also adding MSVC-bundled Clang to PATH below.
 
 set "MSVC="
 
-set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
+rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
+set "MSVC=C:\Program Files\Microsoft Visual Studio\2022\Community"
+
 set "VCVARS=VC\Auxiliary\Build\vcvars64.bat"
 
 set "CXX=clang++"
diff --git a/etc/bootstrap/bbot-bootstrap-freebsd.sh b/etc/bootstrap/bbot-bootstrap-freebsd.sh
index 4668dfd..58eba53 100755
--- a/etc/bootstrap/bbot-bootstrap-freebsd.sh
+++ b/etc/bootstrap/bbot-bootstrap-freebsd.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # file      : etc/bootstrap/bbot-bootstrap-freebsd.sh
-# license   : TBC; see accompanying LICENSE file
+# license   : MIT; see accompanying LICENSE file
 
 # Note: install GNU make with 'pkg install gmake'.
 #
diff --git a/etc/bootstrap/bbot-bootstrap-linux.sh b/etc/bootstrap/bbot-bootstrap-linux.sh
index 71a1dda..8037c27 100755
--- a/etc/bootstrap/bbot-bootstrap-linux.sh
+++ b/etc/bootstrap/bbot-bootstrap-linux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # file      : etc/bootstrap/bbot-bootstrap-linux.sh
-# license   : TBC; see accompanying LICENSE file
+# license   : MIT; see accompanying LICENSE file
 
 if ! jobs="$(nproc)"; then
   jobs=1
@@ -12,7 +12,7 @@ fi
 cd /tmp
 ulimit -c unlimited
 
-# Note: bootstrap script options must come before build.sh options/arguments
+# Note: bootstrap script options must come before build.sh options/arguments.
 #
 "$(dirname "$0")/bbot-bootstrap.sh" --make make --jobs "$jobs" "$@"
 
diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh
index a83b0ec..fd28e8b 100755
--- a/etc/bootstrap/bbot-bootstrap-macos.sh
+++ b/etc/bootstrap/bbot-bootstrap-macos.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # file      : etc/bootstrap/bbot-bootstrap-macos.sh
-# license   : TBC; see accompanying LICENSE file
+# license   : MIT; see accompanying LICENSE file
 
 # open -a Terminal -n -F ~/bbot-bootstrap-macos.sh
 
diff --git a/etc/bootstrap/bbot-bootstrap-mingw.bat b/etc/bootstrap/bbot-bootstrap-mingw.bat
index bea22d9..823bc1c 100644
--- a/etc/bootstrap/bbot-bootstrap-mingw.bat
+++ b/etc/bootstrap/bbot-bootstrap-mingw.bat
@@ -1,7 +1,7 @@
 @echo off
 
 rem file      : etc/bootstrap/bbot-bootstrap-mingw.bat
-rem license   : TBC; see accompanying LICENSE file
+rem license   : MIT; see accompanying LICENSE file
 
 setlocal EnableExtensions EnableDelayedExpansion
 
diff --git a/etc/bootstrap/bbot-bootstrap-msvc-14.bat b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
index efa1ecd..34ecf54 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc-14.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
@@ -1,7 +1,7 @@
 @echo off
 
 rem file      : etc/bootstrap/bbot-bootstrap-msvc-14.bat
-rem license   : TBC; see accompanying LICENSE file
+rem license   : MIT; see accompanying LICENSE file
 
 setlocal EnableExtensions EnableDelayedExpansion
 
diff --git a/etc/bootstrap/bbot-bootstrap-msvc.bat b/etc/bootstrap/bbot-bootstrap-msvc.bat
index ba08fd5..7506f1e 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc.bat
@@ -1,7 +1,7 @@
 @echo off
 
 rem file      : etc/bootstrap/bbot-bootstrap-msvc.bat
-rem license   : TBC; see accompanying LICENSE file
+rem license   : MIT; see accompanying LICENSE file
 
 setlocal EnableExtensions EnableDelayedExpansion
 
@@ -45,7 +45,8 @@ goto start
 :start
 
 rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
-set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
+rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
+set "MSVC=C:\Program Files\Microsoft Visual Studio\2022\Community"
 set "VCVARS=VC\Auxiliary\Build\vcvars64.bat"
 
 set "BUILD=C:\tmp"
diff --git a/etc/bootstrap/bbot-bootstrap.service b/etc/bootstrap/bbot-bootstrap.service
index 6dbf365..5d6c023 100644
--- a/etc/bootstrap/bbot-bootstrap.service
+++ b/etc/bootstrap/bbot-bootstrap.service
@@ -13,13 +13,23 @@ Group=build
 # Old versions of systemd have no '~'.
 WorkingDirectory=/home/build
 
+# Uncomment this if there is an X server running (e.g., Xvfb).
+#
+#Environment=DISPLAY=:99
+
 Environment=CXX=g++
+Environment=INSTALL=/usr/local
 Environment=BUILD=/tmp
 Environment=ENVIRONMENTS=/home/build/environments
 
+# Note: bootstrap script options must come before build.sh options/arguments.
+#
 ExecStart=/usr/local/bin/bbot-bootstrap-linux.sh \
+--install ${INSTALL} \
 --build ${BUILD} \
 --environments ${ENVIRONMENTS} \
+--private \
+--sudo sudo \
 ${CXX}
 
 StandardInput=tty-force
diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh
index 2204de7..e3231bf 100755
--- a/etc/bootstrap/bbot-bootstrap.sh
+++ b/etc/bootstrap/bbot-bootstrap.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # file      : etc/bootstrap/bbot-bootstrap.sh
-# license   : TBC; see accompanying LICENSE file
+# license   : MIT; see accompanying LICENSE file
 
 usage="Usage: $0 [<options>] [<build-options>]"
 
@@ -32,6 +32,7 @@ run ()
 
 # Defaults that can be changed via command line.
 #
+install=
 build=/tmp
 environments="$HOME/environments"
 make=
@@ -39,8 +40,19 @@ jobs=
 
 # Parse options.
 #
+# Note that if --install is specified, any necessary --private/--sudo options
+# will need to be specified as <build-options>.
+#
 while test $# -ne 0; do
   case $1 in
+     --install)
+      shift
+      if test $# -eq 0; then
+	error "missing install directory after --install"
+      fi
+      install="$1"
+      shift
+      ;;
     --build)
       shift
       if test $# -eq 0; then
@@ -84,14 +96,18 @@ done
 # Note: build_options is array-like (expanded unquoted).
 #
 tftp="196.254.111.222"
-install="/usr/local"
-build_options=
 verbose=3
 timeout=600
+build_options=
 
 #install="/tmp/bbot-install"
 #tftp="127.0.0.1:55123"
-#build_options="--install-dir $install"
+
+if test -n "$install"; then
+  build_options="$build_options --install-dir $install"
+else
+  install="/usr/local"
+fi
 
 # If make was specified, add it to build_options.
 #