fixes?

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8690d55fa96c5b3c4cef35bbae9fc5e297b8ea6b..162f64efc5b1394c60793f9addfce08ba82b289c 100644 (file)
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -89,20 +89,6 @@ jobs:
       - name: Verify [make check/install]
         run: make check/install
 
-  # Handles Android (Termux)
-  termux-test:
-    runs-on: ubuntu-latest
-    container:
-      image: termux/termux-docker:latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: pkg update && pkg install -y git make
-
-      - name: Run verification
-        run: make check/install
-
   # Lint job
   lint:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/termux-android.yml b/.github/workflows/termux-android.yml
index 44376967f3505286304608f35ecd0c5793ac1307..68588712e2e69e821563585223827264448d87fe 100644 (file)
--- a/.github/workflows/termux-android.yml
+++ b/.github/workflows/termux-android.yml
@@ -32,8 +32,10 @@ jobs:
           docker run --rm \
             -v "$PWD":/data \
             -w /data \
+            --entrypoint /system/bin/sh \
             termux/termux-docker:latest \
-            sh -c "pkg update && pkg install -y git make \
+            -c "export PATH=/data/data/com.termux/files/usr/bin:$PATH; \
+              pkg update && pkg install -y git make \
               && make install
               && make check/install
               && git-remote-gcrypt --version"

diff --git a/Makefile b/Makefile
index 576edefce8b21d15c45fa04cd18defa02e867f1e..e2a3b7cefba65a1380ee98dddf6b7e840cbabb87 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,9 @@ format:       ##H Format scripts
        -black $(LINT_LOCS_PY)
        -isort $(LINT_LOCS_PY)
        @$(call print_success,OK.)
+       @$(call print_info,Formatting YAML files...)
+       -prettier --write .github/workflows
+       @$(call print_success,OK.)
 
 .PHONY: lint
 lint:  ##H Run shellcheck

diff --git a/completions/gen_docs.sh b/completions/gen_docs.sh
index 00d5d5d641c5c7a9babc08e7a94b9925ee571a4c..55b83b33010429806e9018ea602cce9afba76549 100755 (executable)
--- a/completions/gen_docs.sh
+++ b/completions/gen_docs.sh
@@ -145,7 +145,9 @@ rm .fish_tmp
 
 # 3. Generate README
 echo "Generating $README_OUT..."
-sed "s/{commands_help}/$(printf '%s\n' "$COMMANDS_HELP" | sed 's/[\/&]/\\&/g' | sed ':a;N;$!ba;s/\n/\\n/g')/" "$README_TMPL" >"$README_OUT"
+# Escape backslashes, forward slashes, and ampersands, then flatten newlines to \n
+ESCAPED_HELP=$(printf '%s\n' "$COMMANDS_HELP" | sed 's/\\/\\\\/g; s/[\/&]/\\&/g' | awk 'NR>1{printf "\\n"} {printf "%s", $0}')
+sed "s/{commands_help}/$ESCAPED_HELP/" "$README_TMPL" >"$README_OUT"
 
 # 4. Generate Bash
 echo "Generating Bash completions..."