From d6b2e2e5fb67c4d14a277a6a04cf7b04922cb111 Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Thu, 13 Nov 2025 17:14:46 +0000 Subject: [PATCH 1/5] Install Please run-time dependencies from Ports `bash`, `curl` and `git` are enough to be able to run the `pleasew` script in Please's plugin repos on FreeBSD (although not necessarily enough to compile each repo in its entirety - those dependencies need to be identified and listed separately). --- readme.md | 6 +++++- resources/provision.sh | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) 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..6c748b6 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 '^#' | '\n' ' ') else bootstrap_pkg - install_local_package sudo - install_local_package bash - install_local_package curl - install_local_package rsync + echo "$pkgs" | grep -v '^#' | while IFS= read -r pkg; do + install_local_package "$pkg" + done fi } From a857baba201d6e0f55995fe80af1c68b835e47d1 Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Thu, 13 Nov 2025 17:32:53 +0000 Subject: [PATCH 2/5] Syntax --- resources/provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/provision.sh b/resources/provision.sh index 6c748b6..d18054c 100755 --- a/resources/provision.sh +++ b/resources/provision.sh @@ -135,10 +135,10 @@ install_extra_packages() { git " if upstream_pkg_site_available; then - ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^#' | '\n' ' ') + ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^\s*//' | '\n' ' ') else bootstrap_pkg - echo "$pkgs" | grep -v '^#' | while IFS= read -r pkg; do + echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | | sed -e 's/^\s*//' | while IFS= read -r pkg; do install_local_package "$pkg" done fi From 173b1c08cb44abbff8230f0904994eee01910f86 Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Thu, 13 Nov 2025 17:41:16 +0000 Subject: [PATCH 3/5] Typo --- resources/provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/provision.sh b/resources/provision.sh index d18054c..c043f43 100755 --- a/resources/provision.sh +++ b/resources/provision.sh @@ -138,7 +138,7 @@ install_extra_packages() { ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^\s*//' | '\n' ' ') else bootstrap_pkg - echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | | sed -e 's/^\s*//' | while IFS= read -r pkg; do + echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^\s*//' | while IFS= read -r pkg; do install_local_package "$pkg" done fi From 2c2eb25691a9d5a41e3a9be628afd301b80a6478 Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Thu, 13 Nov 2025 17:53:49 +0000 Subject: [PATCH 4/5] BSD sed syntax --- resources/provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/provision.sh b/resources/provision.sh index c043f43..a47fb14 100755 --- a/resources/provision.sh +++ b/resources/provision.sh @@ -135,10 +135,10 @@ install_extra_packages() { git " if upstream_pkg_site_available; then - ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^\s*//' | '\n' ' ') + ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | '\n' ' ') else bootstrap_pkg - echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^\s*//' | while IFS= read -r pkg; do + echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | while IFS= read -r pkg; do install_local_package "$pkg" done fi From 189dbc8ec1e199aea08d409041255f5450a07c4e Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Thu, 13 Nov 2025 18:02:42 +0000 Subject: [PATCH 5/5] Yet another typo --- resources/provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/provision.sh b/resources/provision.sh index a47fb14..7c8d85b 100755 --- a/resources/provision.sh +++ b/resources/provision.sh @@ -135,7 +135,7 @@ install_extra_packages() { git " if upstream_pkg_site_available; then - ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | '\n' ' ') + ASSUME_ALWAYS_YES=yes pkg install $(echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | tr '\n' ' ') else bootstrap_pkg echo "$pkgs" | grep -v '^\s*\(#\|\s*$\)' | sed -e 's/^[[:space:]]*//' | while IFS= read -r pkg; do