#25 m6/entrypoint-testfix

mergedpassopened
details
branches
master ← m6/entrypoint-testfix
updated
id
aa9767cd-7852-4913-88e9-315578113d40

Patch

.forge/merges/2026-09-10T06-11-44.077140678Z.md+9 −0
diff --git a/.forge/merges/2026-09-10T06-11-44.077140678Z.md b/.forge/merges/2026-09-10T06-11-44.077140678Z.mdnew file mode 100644index 0000000..7345e57--- /dev/null+++ b/.forge/merges/2026-09-10T06-11-44.077140678Z.md@@ -0,0 +1,9 @@1+---2+pr: c1de23b1-1f96-42ea-8661-9468abf6409a3+applied: false4+verdict: fail5+resolved: []6+created: 2026-09-10T06:11:44.077140678Z7+---8+failed at 02_test.sh.9+patch: 447b0de892e249edf47a7aaded277d93d25b1dd8
.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff+73 −0
diff --git a/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diffnew file mode 100644index 0000000..1e3a849--- /dev/null+++ b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff@@ -0,0 +1,73 @@1+From aa2f0d1bc82722efe09d0ee0a471058775ff06ab Mon Sep 17 00:00:00 20012+From: gl0w <gl0w@world>3+Date: Thu, 10 Sep 2026 07:11:44 +01004+Subject: [PATCH] m6/entrypoint: POSIX-safe argv (spaces/quotes in5+ name/description)6+7+---8+ entrypoint.sh | 31 +++++++++++++++----------------9+ 1 file changed, 15 insertions(+), 16 deletions(-)10+11+diff --git a/entrypoint.sh b/entrypoint.sh12+index 6d4f149..191fbe9 10075513+--- a/entrypoint.sh14++++ b/entrypoint.sh15+@@ -26,40 +26,39 @@ set -eu16+ # build below would misreport "branch not found".17+ git config --global --add safe.directory /data/repo18+ 19+-BUILD_ARGS=""20++# Build argv with "$@" (POSIX-safe: values with spaces/quotes survive).21++set -- /data/repo -o /srv/www22+ if [ -n "${HU13_BRANCH:-}" ]; then23+-    BUILD_ARGS="$BUILD_ARGS --branch $HU13_BRANCH"24++    set -- "$@" --branch "$HU13_BRANCH"25+ fi26+ if [ -n "${HU13_CLONE_URL:-}" ]; then27+-    BUILD_ARGS="$BUILD_ARGS --clone-url $HU13_CLONE_URL"28++    set -- "$@" --clone-url "$HU13_CLONE_URL"29+ fi30+ if [ -n "${HU13_REPO_NAME:-}" ]; then31+-    BUILD_ARGS="$BUILD_ARGS --repo-name $HU13_REPO_NAME"32++    set -- "$@" --repo-name "$HU13_REPO_NAME"33+ fi34+ if [ -n "${HU13_DESCRIPTION:-}" ]; then35+-    BUILD_ARGS="$BUILD_ARGS --description $HU13_DESCRIPTION"36++    set -- "$@" --description "$HU13_DESCRIPTION"37+ fi38++hu13 build "$@"39+ 40+-# shellcheck disable=SC208641+-hu13 build /data/repo -o /srv/www $BUILD_ARGS42++set -- --www /srv/www --inbox-dir /data/inbox \43++    --listen "${HU13_LISTEN:-0.0.0.0:39313}"44+ 45+-SERVE_ARGS=""46+ if [ -n "${HU13_MAX_TITLE:-}" ]; then47+-    SERVE_ARGS="$SERVE_ARGS --max-title $HU13_MAX_TITLE"48++    set -- "$@" --max-title "$HU13_MAX_TITLE"49+ fi50+ if [ -n "${HU13_MAX_BODY:-}" ]; then51+-    SERVE_ARGS="$SERVE_ARGS --max-body $HU13_MAX_BODY"52++    set -- "$@" --max-body "$HU13_MAX_BODY"53+ fi54+ if [ -n "${HU13_MAX_BYTES:-}" ]; then55+-    SERVE_ARGS="$SERVE_ARGS --max-bytes $HU13_MAX_BYTES"56++    set -- "$@" --max-bytes "$HU13_MAX_BYTES"57+ fi58+ if [ -n "${HU13_RATE_PER_HOUR:-}" ]; then59+-    SERVE_ARGS="$SERVE_ARGS --rate-per-hour $HU13_RATE_PER_HOUR"60++    set -- "$@" --rate-per-hour "$HU13_RATE_PER_HOUR"61+ fi62+ if [ -n "${HU13_QUOTA:-}" ]; then63+-    SERVE_ARGS="$SERVE_ARGS --quota $HU13_QUOTA"64++    set -- "$@" --quota "$HU13_QUOTA"65+ fi66+ 67+-# shellcheck disable=SC208668+-exec hu13 serve --www /srv/www --inbox-dir /data/inbox \69+-    --listen "${HU13_LISTEN:-0.0.0.0:39313}" $SERVE_ARGS70++exec hu13 serve "$@"71+-- 72+2.55.073+
.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md+12 −0
diff --git a/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.mdnew file mode 100644index 0000000..43d0194--- /dev/null+++ b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md@@ -0,0 +1,12 @@1+---2+id: c1de23b1-1f96-42ea-8661-9468abf6409a3+title: m6/entrypoint-quote4+state: open5+base: master6+head: m6/entrypoint-quote7+draft: false8+issues: []9+ci: fail10+created: 2026-09-10T06:11:44.052625600Z11+updated: 2026-09-10T06:11:56.573743204Z12+---
tests/header_config.rs+4 −4
diff --git a/tests/header_config.rs b/tests/header_config.rsindex ef81f20..374d829 100644--- a/tests/header_config.rs+++ b/tests/header_config.rs@@ -271,8 +271,10 @@ fn entrypoint_and_dockerfile_pass_both_envs() {271271     for needle in [272272         "HU13_REPO_NAME",273273         "HU13_DESCRIPTION",274-        "--repo-name $HU13_REPO_NAME",275-        "--description $HU13_DESCRIPTION",274+        "--repo-name",275+        "--description",276+        "\"$HU13_REPO_NAME\"",277+        "\"$HU13_DESCRIPTION\"",276278     ] {277279         assert!(ep.contains(needle), "entrypoint passes {needle}");278280     }279-- 2.55.0From ced4a2b17ef99233ae5a44dc637829c280240f18 Mon Sep 17 00:00:00 2001From: gl0w <gl0w@world>Date: Thu, 10 Sep 2026 07:13:15 +0100Subject: [PATCH 2/2] m6/entrypoint-testfix: polish test matches argv form280---281281 .../merges/2026-09-10T06-12-21.665260655Z.md  |   9 ++282282 .../patch.diff                                | 147 ++++++++++++++++++283283 .../pr.md                                     |  12 ++284284 tests/polish.rs                               |   4 +-285285 4 files changed, 170 insertions(+), 2 deletions(-)286286 create mode 100644 .forge/merges/2026-09-10T06-12-21.665260655Z.md287287 create mode 100644 .forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/patch.diff288288 create mode 100644 .forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/pr.md
.forge/merges/2026-09-10T06-12-21.665260655Z.md+9 −0
diff --git a/.forge/merges/2026-09-10T06-12-21.665260655Z.md b/.forge/merges/2026-09-10T06-12-21.665260655Z.mdnew file mode 100644index 0000000..75c1647--- /dev/null+++ b/.forge/merges/2026-09-10T06-12-21.665260655Z.md@@ -0,0 +1,9 @@1+---2+pr: 9a0d0b48-7cda-41e0-8cf1-48f63a38b1a43+applied: false4+verdict: fail5+resolved: []6+created: 2026-09-10T06:12:21.665260655Z7+---8+failed at 02_test.sh.9+patch: 44d449bb8367f7114a0279f44b15548437c7f097
.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/patch.diff+147 −0
diff --git a/.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/patch.diff b/.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/patch.diffnew file mode 100644index 0000000..d54f43d--- /dev/null+++ b/.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/patch.diff@@ -0,0 +1,147 @@1+From 69016ee6a4c0e67182c43b7c0d0246f831da1db0 Mon Sep 17 00:00:00 20012+From: gl0w <gl0w@world>3+Date: Thu, 10 Sep 2026 07:12:21 +01004+Subject: [PATCH] m6/entrypoint-testfix: match POSIX-safe argv form5+6+---7+ .../merges/2026-09-10T06-11-44.077140678Z.md  |  9 +++8+ .../patch.diff                                | 73 +++++++++++++++++++9+ .../pr.md                                     | 12 +++10+ tests/header_config.rs                        |  6 +-11+ 4 files changed, 98 insertions(+), 2 deletions(-)12+ create mode 100644 .forge/merges/2026-09-10T06-11-44.077140678Z.md13+ create mode 100644 .forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff14+ create mode 100644 .forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md15+16+diff --git a/.forge/merges/2026-09-10T06-11-44.077140678Z.md b/.forge/merges/2026-09-10T06-11-44.077140678Z.md17+new file mode 10064418+index 0000000..7345e5719+--- /dev/null20++++ b/.forge/merges/2026-09-10T06-11-44.077140678Z.md21+@@ -0,0 +1,9 @@22++---23++pr: c1de23b1-1f96-42ea-8661-9468abf6409a24++applied: false25++verdict: fail26++resolved: []27++created: 2026-09-10T06:11:44.077140678Z28++---29++failed at 02_test.sh.30++patch: 447b0de892e249edf47a7aaded277d93d25b1dd831+diff --git a/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff32+new file mode 10064433+index 0000000..1e3a84934+--- /dev/null35++++ b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/patch.diff36+@@ -0,0 +1,73 @@37++From aa2f0d1bc82722efe09d0ee0a471058775ff06ab Mon Sep 17 00:00:00 200138++From: gl0w <gl0w@world>39++Date: Thu, 10 Sep 2026 07:11:44 +010040++Subject: [PATCH] m6/entrypoint: POSIX-safe argv (spaces/quotes in41++ name/description)42++43++---44++ entrypoint.sh | 31 +++++++++++++++----------------45++ 1 file changed, 15 insertions(+), 16 deletions(-)46++47++diff --git a/entrypoint.sh b/entrypoint.sh48++index 6d4f149..191fbe9 10075549++--- a/entrypoint.sh50+++++ b/entrypoint.sh51++@@ -26,40 +26,39 @@ set -eu52++ # build below would misreport "branch not found".53++ git config --global --add safe.directory /data/repo54++ 55++-BUILD_ARGS=""56+++# Build argv with "$@" (POSIX-safe: values with spaces/quotes survive).57+++set -- /data/repo -o /srv/www58++ if [ -n "${HU13_BRANCH:-}" ]; then59++-    BUILD_ARGS="$BUILD_ARGS --branch $HU13_BRANCH"60+++    set -- "$@" --branch "$HU13_BRANCH"61++ fi62++ if [ -n "${HU13_CLONE_URL:-}" ]; then63++-    BUILD_ARGS="$BUILD_ARGS --clone-url $HU13_CLONE_URL"64+++    set -- "$@" --clone-url "$HU13_CLONE_URL"65++ fi66++ if [ -n "${HU13_REPO_NAME:-}" ]; then67++-    BUILD_ARGS="$BUILD_ARGS --repo-name $HU13_REPO_NAME"68+++    set -- "$@" --repo-name "$HU13_REPO_NAME"69++ fi70++ if [ -n "${HU13_DESCRIPTION:-}" ]; then71++-    BUILD_ARGS="$BUILD_ARGS --description $HU13_DESCRIPTION"72+++    set -- "$@" --description "$HU13_DESCRIPTION"73++ fi74+++hu13 build "$@"75++ 76++-# shellcheck disable=SC208677++-hu13 build /data/repo -o /srv/www $BUILD_ARGS78+++set -- --www /srv/www --inbox-dir /data/inbox \79+++    --listen "${HU13_LISTEN:-0.0.0.0:39313}"80++ 81++-SERVE_ARGS=""82++ if [ -n "${HU13_MAX_TITLE:-}" ]; then83++-    SERVE_ARGS="$SERVE_ARGS --max-title $HU13_MAX_TITLE"84+++    set -- "$@" --max-title "$HU13_MAX_TITLE"85++ fi86++ if [ -n "${HU13_MAX_BODY:-}" ]; then87++-    SERVE_ARGS="$SERVE_ARGS --max-body $HU13_MAX_BODY"88+++    set -- "$@" --max-body "$HU13_MAX_BODY"89++ fi90++ if [ -n "${HU13_MAX_BYTES:-}" ]; then91++-    SERVE_ARGS="$SERVE_ARGS --max-bytes $HU13_MAX_BYTES"92+++    set -- "$@" --max-bytes "$HU13_MAX_BYTES"93++ fi94++ if [ -n "${HU13_RATE_PER_HOUR:-}" ]; then95++-    SERVE_ARGS="$SERVE_ARGS --rate-per-hour $HU13_RATE_PER_HOUR"96+++    set -- "$@" --rate-per-hour "$HU13_RATE_PER_HOUR"97++ fi98++ if [ -n "${HU13_QUOTA:-}" ]; then99++-    SERVE_ARGS="$SERVE_ARGS --quota $HU13_QUOTA"100+++    set -- "$@" --quota "$HU13_QUOTA"101++ fi102++ 103++-# shellcheck disable=SC2086104++-exec hu13 serve --www /srv/www --inbox-dir /data/inbox \105++-    --listen "${HU13_LISTEN:-0.0.0.0:39313}" $SERVE_ARGS106+++exec hu13 serve "$@"107++-- 108++2.55.0109++110+diff --git a/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md111+new file mode 100644112+index 0000000..43d0194113+--- /dev/null114++++ b/.forge/prs/c1de23b1-1f96-42ea-8661-9468abf6409a/pr.md115+@@ -0,0 +1,12 @@116++---117++id: c1de23b1-1f96-42ea-8661-9468abf6409a118++title: m6/entrypoint-quote119++state: open120++base: master121++head: m6/entrypoint-quote122++draft: false123++issues: []124++ci: fail125++created: 2026-09-10T06:11:44.052625600Z126++updated: 2026-09-10T06:11:56.573743204Z127++---128+diff --git a/tests/header_config.rs b/tests/header_config.rs129+index ef81f20..374d829 100644130+--- a/tests/header_config.rs131++++ b/tests/header_config.rs132+@@ -271,8 +271,10 @@ fn entrypoint_and_dockerfile_pass_both_envs() {133+     for needle in [134+         "HU13_REPO_NAME",135+         "HU13_DESCRIPTION",136+-        "--repo-name $HU13_REPO_NAME",137+-        "--description $HU13_DESCRIPTION",138++        "--repo-name",139++        "--description",140++        "\"$HU13_REPO_NAME\"",141++        "\"$HU13_DESCRIPTION\"",142+     ] {143+         assert!(ep.contains(needle), "entrypoint passes {needle}");144+     }145+-- 146+2.55.0147+
.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/pr.md+12 −0
diff --git a/.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/pr.md b/.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/pr.mdnew file mode 100644index 0000000..2affdef--- /dev/null+++ b/.forge/prs/9a0d0b48-7cda-41e0-8cf1-48f63a38b1a4/pr.md@@ -0,0 +1,12 @@1+---2+id: 9a0d0b48-7cda-41e0-8cf1-48f63a38b1a43+title: m6/entrypoint-testfix4+state: open5+base: master6+head: m6/entrypoint-testfix7+draft: false8+issues: []9+ci: fail10+created: 2026-09-10T06:12:21.642641147Z11+updated: 2026-09-10T06:12:37.499922812Z12+---
tests/polish.rs+2 −3
diff --git a/tests/polish.rs b/tests/polish.rsindex e71a09f..92f49f2 100644--- a/tests/polish.rs+++ b/tests/polish.rs@@ -267,10 +267,10 @@ fn entrypoint_syntax_checks() {267267     let text = std::fs::read_to_string(&ep).expect("read entrypoint");268268     for needle in [269269         "set -eu",270-        "hu13 build /data/repo -o /srv/www",270+        "hu13 build",271271         "HU13_BRANCH",272272         "HU13_CLONE_URL",273-        "exec hu13 serve --www /srv/www --inbox-dir /data/inbox",273+        "exec hu13 serve",274274         "0.0.0.0:39313",275275         "safe.directory",276276     ] {277-- 2.55.0

Comments (0)

No comments yet.

Reviews (0)

No reviews yet.

all pulls