diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml index 08cf85a8..bc19542a 100644 --- a/.github/workflows/appimage10.yml +++ b/.github/workflows/appimage10.yml @@ -149,7 +149,7 @@ jobs: if [ -n "$tcl_sha" ] && [ -n "$tk_sha" ]; then sha_status="verified against known SHA" else - sha_status="best-effort — no known SHA (actual SHA is printed during Docker build)" + sha_status="best-effort — no known SHA (actual SHA will be printed during Docker build)" fi if [ "$source_method" = "github" ]; then diff --git a/.github/workflows/appimage7.yml b/.github/workflows/appimage7.yml index 22b8ccd4..2140680f 100644 --- a/.github/workflows/appimage7.yml +++ b/.github/workflows/appimage7.yml @@ -149,7 +149,7 @@ jobs: if [ -n "$tcl_sha" ] && [ -n "$tk_sha" ]; then sha_status="verified against known SHA" else - sha_status="best-effort — no known SHA (actual SHA is printed during Docker build)" + sha_status="best-effort — no known SHA (actual SHA will be printed during Docker build)" fi if [ "$source_method" = "github" ]; then diff --git a/.github/workflows/appimage8.yml b/.github/workflows/appimage8.yml index 22c860bb..1f5ffec7 100644 --- a/.github/workflows/appimage8.yml +++ b/.github/workflows/appimage8.yml @@ -149,7 +149,7 @@ jobs: if [ -n "$tcl_sha" ] && [ -n "$tk_sha" ]; then sha_status="verified against known SHA" else - sha_status="best-effort — no known SHA (actual SHA is printed during Docker build)" + sha_status="best-effort — no known SHA (actual SHA will be printed during Docker build)" fi if [ "$source_method" = "github" ]; then diff --git a/.github/workflows/appimage9.yml b/.github/workflows/appimage9.yml index 765f6476..571e671e 100644 --- a/.github/workflows/appimage9.yml +++ b/.github/workflows/appimage9.yml @@ -149,7 +149,7 @@ jobs: if [ -n "$tcl_sha" ] && [ -n "$tk_sha" ]; then sha_status="verified against known SHA" else - sha_status="best-effort — no known SHA (actual SHA is printed during Docker build)" + sha_status="best-effort — no known SHA (actual SHA will be printed during Docker build)" fi if [ "$source_method" = "github" ]; then diff --git a/appimage/10/Makefile b/appimage/10/Makefile index 5fe7c6de..39a5e46b 100644 --- a/appimage/10/Makefile +++ b/appimage/10/Makefile @@ -45,7 +45,12 @@ prefix/bin/magic: Dockerfile Makefile docker cp $$id:/prefix ./prefix ; \ docker rm -v $$id mkdir -p prefix/lib/tcl$(TCL_VERSION) - if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; else echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; exit 1; fi + if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then \ + cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; \ + else \ + echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; \ + exit 1; \ + fi appimagetool: curl -L "$(APPIMAGETOOL_DOWNLOAD_URL)" > ./appimagetool diff --git a/appimage/7/Makefile b/appimage/7/Makefile index 12323fcc..893d63a8 100644 --- a/appimage/7/Makefile +++ b/appimage/7/Makefile @@ -45,7 +45,12 @@ prefix/bin/magic: Dockerfile Makefile docker cp $$id:/prefix ./prefix ; \ docker rm -v $$id mkdir -p prefix/lib/tcl$(TCL_VERSION) - if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; else echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; exit 1; fi + if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then \ + cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; \ + else \ + echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; \ + exit 1; \ + fi appimagetool: curl -L "$(APPIMAGETOOL_DOWNLOAD_URL)" > ./appimagetool diff --git a/appimage/8/Makefile b/appimage/8/Makefile index 94f97d74..758b3756 100644 --- a/appimage/8/Makefile +++ b/appimage/8/Makefile @@ -45,7 +45,12 @@ prefix/bin/magic: Dockerfile Makefile docker cp $$id:/prefix ./prefix ; \ docker rm -v $$id mkdir -p prefix/lib/tcl$(TCL_VERSION) - if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; else echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; exit 1; fi + if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then \ + cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; \ + else \ + echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; \ + exit 1; \ + fi appimagetool: curl -L "$(APPIMAGETOOL_DOWNLOAD_URL)" > ./appimagetool diff --git a/appimage/9/Makefile b/appimage/9/Makefile index cac4b8fa..d4f0b181 100644 --- a/appimage/9/Makefile +++ b/appimage/9/Makefile @@ -45,7 +45,12 @@ prefix/bin/magic: Dockerfile Makefile docker cp $$id:/prefix ./prefix ; \ docker rm -v $$id mkdir -p prefix/lib/tcl$(TCL_VERSION) - if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; else echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; exit 1; fi + if [ -d "prefix/lib/tcl$(TCL_ABI_VERSION)" ]; then \ + cp -r "prefix/lib/tcl$(TCL_ABI_VERSION)" "prefix/lib/tcl$(TCL_VERSION)/library"; \ + else \ + echo "Missing expected Tcl ABI directory: prefix/lib/tcl$(TCL_ABI_VERSION)" >&2; \ + exit 1; \ + fi appimagetool: curl -L "$(APPIMAGETOOL_DOWNLOAD_URL)" > ./appimagetool