diff --git a/readme.md b/readme.md index 4bf5df2..887ffd4 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,11 @@ guaranteed to be useful for any other purpose. ## Changes to upstream -* Only the FreeBSD 14.3 x86-64 image is built. +- Only the FreeBSD 14.3 x86-64 image is built. +- Additional run-time dependencies for Please and the `pleasew` script are installed from Ports: + - bash + - curl + - git ## Release version numbering diff --git a/resources/provision.sh b/resources/provision.sh index e531ccc..7c8d85b 100755 --- a/resources/provision.sh +++ b/resources/provision.sh @@ -124,14 +124,23 @@ install_local_package() { } install_extra_packages() { + local pkgs=" + # Inherited from upstream freebsd-builder: + sudo + rsync + # Additional run-time dependencies for pleasew: + bash + curl + # Additional run-time dependencies for Please: + git + " if upstream_pkg_site_available; then - ASSUME_ALWAYS_YES=yes pkg install sudo bash curl rsync + ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | tr '\n' ' ') else bootstrap_pkg - install_local_package sudo - install_local_package bash - install_local_package curl - install_local_package rsync + echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | while IFS= read -r pkg; do + install_local_package "$pkg" + done fi }