config-helper: fix edge cases

.gitattributes

@@ -0,0 +1,8 @@
+# 2024 January 3
+# https://github.com/bevry/base
+
+# never modify any line ending in any file, disregarding all nonsense from eol, autocrlf, renormalize, safecrlf, usecrlfattr, allBinary
+* -text
+
+# =====================================
+# CUSTOM

.github/workflows/dorothy-workflow.yml

@@ -1,14 +1,15 @@
 # don't use [shell: bash] unless needed, as for macos-fresh that caused an infinite queue for the test step, and for linux bash may not exist yet
 # https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
 name: dorothy-workflow
-'on':
+on:
   - push
   - pull_request
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 jobs:
   login-shells-and-linting:
+    if: github.event_name == 'push' || ( github.event_name == 'pull_request' && (toJSON(github.event.pull_request.requested_reviewers) != '[]' || toJSON(github.event.pull_request.requested_teams) != '[]' ) )
     runs-on: ubuntu-latest
     steps:
       - name: 'Dorothy Install'
@@ -39,17 +40,17 @@ jobs:
       - name: 'Dorothy Login Shell: bash'
         shell: bash -leo pipefail {0}
         run: |
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: zsh'
         shell: zsh -l {0}
         run: |
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: fish'
         shell: fish -l {0}
         run: |
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: nu'
         shell: nu -l {0}
@@ -58,7 +59,7 @@ jobs:
           # source '/Users/runner/Library/Application Support/nushell/login.nu' # macos
           source '/home/runner/.config/nushell/login.nu' # linux
           # continue as normal
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: xonsh'
         env:
@@ -69,7 +70,7 @@ jobs:
           CC: '' #fix: https://github.com/bevry/dorothy/actions/runs/7538922544/job/20520381661#step:8:13
         shell: xonsh -DXONSH_SHOW_TRACEBACK=True -l {0}
         run: |
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: elvish'
         shell: elvish {0}
@@ -78,17 +79,17 @@ jobs:
           # for details see: https://github.com/elves/elvish/issues/1726
           eval (cat '/home/runner/.local/share/dorothy/init.elv' | slurp)
           # continue as normal
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: dash'
         shell: dash -l {0}
         run: |
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Dorothy Login Shell: ksh'
         shell: ksh -l {0}
         run: |
-          command-exists dorothy
+          command-exists -- dorothy
           echo-style --success='ok'
       - name: 'Trunk Format'
         if: github.event_name == 'push'
@@ -111,6 +112,7 @@ jobs:
         run: dorothy check
   # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
   runner-test:
+    if: github.event_name == 'push' || ( github.event_name == 'pull_request' && (toJSON(github.event.pull_request.requested_reviewers) != '[]' || toJSON(github.event.pull_request.requested_teams) != '[]' ) )
     strategy:
       fail-fast: false
       matrix:
@@ -125,6 +127,7 @@ jobs:
           # ensure dorothy is cloned, and run command
           bash -c "$(curl -fsSL 'https://dorothy.bevry.me/run?slug=${{ github.repository }}&commit=${{ github.event.pull_request.head.sha || github.sha }}')" -- dorothy test
   fresh-macos-test:
+    if: github.event_name == 'push' || ( github.event_name == 'pull_request' && (toJSON(github.event.pull_request.requested_reviewers) != '[]' || toJSON(github.event.pull_request.requested_teams) != '[]' ) )
     strategy:
       fail-fast: false
       matrix:
@@ -142,6 +145,7 @@ jobs:
           # ensure dorothy is cloned, and run command
           bash -c "$(curl -fsSL 'https://dorothy.bevry.me/run?slug=${{ github.repository }}&commit=${{ github.event.pull_request.head.sha || github.sha }}')" -- dorothy test
   container-test:
+    if: github.event_name == 'push' || ( github.event_name == 'pull_request' && (toJSON(github.event.pull_request.requested_reviewers) != '[]' || toJSON(github.event.pull_request.requested_teams) != '[]' ) )
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.trunk/trunk.yaml

@@ -10,8 +10,8 @@ plugins:
 runtimes:
   enabled:
     - go@1.21.0
-    - node@18.12.1
     - python@3.10.8
+    # - node@18.12.1 <-- there's only a single Node.js file: echo-url-coder.js
 actions:
   disabled:
     - trunk-announce
@@ -23,7 +23,6 @@ lint:
     - actionlint@1.6.27
     - black@24.3.0
     - checkov@3.2.48
-    - eslint@8.57.0
     - flake8@7.0.0
     - git-diff-check@SYSTEM
     - gitleaks@8.18.2
@@ -37,6 +36,7 @@ lint:
     - trufflehog@3.71.0
     - yamllint@1.35.1
   disabled:
+    - eslint # it can't find the bevry config extensions for some reason
     - trivy
     - oxipng # broken for some reason on my mac mini
   ignore:

.vscode/extensions.json

@@ -7,6 +7,7 @@
     "codezombiech.gitignore",
     "editorconfig.editorconfig",
     "jeff-hykin.better-shellscript-syntax",
+    "luggage66.awk",
     "sidneys1.gitconfig",
     "skyapps.fish-vscode",
     "streetsidesoftware.code-spell-checker",

.vscode/workspace.code-workspace

@@ -28,6 +28,7 @@
       "Xonsh",
       "Zsh",
       "Bevry"
-    ]
+	],
+	"deno.enable": true
   }
 }

commands.beta/convert-helper

@@ -135,10 +135,11 @@ function convert_helper() (
 		filename="$(fs-filename -- "$path")"
 		extension="$(fs-extension -- "$path")"
 		if test -n "$option_timestamp"; then
+			# prefix filename with timestamp
 			if test "$option_timestamp" = 'yes'; then
-				filename="$(date-helper --8601 | sd ':' '-') $filename"
+				filename="$(date-helper --8601 | echo-regexp -g ':' '-') $filename"
 			else
-				filename="$(date-helper --8601 | sd ':' '-') $option_timestamp"
+				filename="$(date-helper --8601 | echo-regexp -g ':' '-') $option_timestamp"
 			fi
 			cp "$path" "$filename.$extension"
 			path="$filename.$extension"

commands.beta/echo-exit-status

@@ -48,7 +48,7 @@ function echo_exit_status() (
 
 	local cmd_status
 	eval_capture --statusvar=cmd_status -- "${cmd[@]}"
-	__print_line "$cmd_status"
+	__print_lines "$cmd_status"
 )
 
 # fire if invoked standalone

commands.beta/echo-html-coder.recode

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# recode decoding fails with: recode: Untranslatable input in step `ISO-10646-UCS-2..ANSI_X3.4-1968'
+if test "$1" = 'decode'; then
+	recode html..ascii <<<"$2"
+else
+	recode ascii..html <<<"$2"
+fi

commands.beta/echo-html-coder.textutil

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# this doesn't work as expected
+if test "$1" = 'decode'; then
+	textutil -convert html -format txt -inputencoding UTF-8 -stdin -stdout <<<"$2"
+else
+	textutil -convert txt -format html -inputencoding UTF-8 -stdin -stdout <<<"$2"
+fi

commands.beta/echo-html-coder.xmlstarlet

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# xmlstarlet is too old to be available
+if test "$1" = 'decode'; then
+	xmlstarlet unesc "$2"
+else
+	xmlstarlet esc "$1"
+fi

commands.beta/echo-if-directory

@@ -36,7 +36,7 @@ function echo_if_directory() (
 
 	function on_input {
 		if test -n "$1" -a -d "$1"; then
-			__print_line "$1"
+			__print_lines "$1"
 		fi
 	}
 

commands.beta/echo-if-empty

@@ -25,12 +25,12 @@ function echo_if_empty() (
 			    my-fallback-value
 			    # exit status: 0
 
-			echo | echo-if-empty 'my-fallback-value'
+			echo | echo-if-empty 'my-fallback-value' --stdin
 
 			    my-fallback-value
 			    # exit status: 0
 
-			echo 'a-value' | echo-if-empty 'my-fallback-value'
+			echo 'a-value' | echo-if-empty 'my-fallback-value' --stdin
 
 			    'a-value'
 			    # exit status: 0

commands.beta/echo-if-executable

@@ -40,7 +40,7 @@ function echo_if_executable() (
 
 	function on_input {
 		if test -n "$1" -a -x "$1"; then
-			__print_line "$1"
+			__print_lines "$1"
 		fi
 	}
 

commands.beta/echo-if-path

@@ -36,7 +36,7 @@ function echo_if_path() (
 
 	function on_input {
 		if is-present -- "$1"; then
-			__print_line "$1"
+			__print_lines "$1"
 		fi
 	}
 

commands.beta/echo-nonflags

@@ -46,7 +46,7 @@ function echo_nonflags() (
 
 	function on_input {
 		if [[ $1 != -* ]]; then
-			__print_line "$1"
+			__print_lines "$1"
 		fi
 	}
 

commands.beta/echo-numeric

@@ -47,7 +47,7 @@ function echo_numeric() (
 	local had_an_invalid_input=no
 	function on_input {
 		if is-number -- "$1"; then
-			__print_line "$1"
+			__print_lines "$1"
 		else
 			echo-style --error="[$1] is not a number" >/dev/stderr
 			had_an_invalid_input=yes

commands.beta/echo-sort

@@ -56,7 +56,7 @@ function echo_sort() (
 	}
 	# and sort once we have all of them
 	function on_finish {
-		echo-lines -- "${inputs[@]}" | sort
+		__print_lines "${inputs[@]}" | sort
 	}
 
 	stdinargs "$@"

commands.beta/echo-url-coder.php

@@ -0,0 +1,8 @@
+#!/usr/bin/env php
+<?php
+# space is turned to +, not %20
+if ( $argv[1] == "decode" ) {
+	printf("%s\n", urldecode($argv[2]));
+} else {
+	printf("%s\n", urlencode($argv[2]));
+}

commands.beta/echo-values

@@ -47,7 +47,7 @@ function echo_values() (
 
 	function on_input {
 		if is-value -- "$1"; then
-			__print_line "$1"
+			__print_lines "$1"
 		fi
 	}
 

commands.beta/edit-dns

@@ -41,12 +41,12 @@ function edit_dns() (
 	# edit /etc/resolv.conf
 
 	if get-app --quiet -- 'ProtonVPN'; then
-		__print_line 'ProtonVPN enforces its own DNS'
-	elif command-exists dnscrypt-proxy; then
-		__print_line 'Editing DNS configuration of dnscrypt-proxy'
+		__print_lines 'ProtonVPN enforces its own DNS'
+	elif command-exists -- dnscrypt-proxy; then
+		__print_lines 'Editing DNS configuration of dnscrypt-proxy'
 		edit --wait -- "${HOMEBREW_PREFIX:-"/usr/local"}/etc/dnscrypt-proxy.toml"
 	else
-		__print_line 'DNS editing only supported for dnscrypt-proxy'
+		__print_lines 'DNS editing only supported for dnscrypt-proxy'
 	fi
 )
 

commands.beta/ensure-trailing-slash

@@ -50,16 +50,16 @@ function ensure_trailing_slash() (
 	for path in "${option_paths[@]}"; do
 		if test -d "$path"; then
 			if [[ $path != */ ]]; then
-				__print_line "$path/"
+				__print_lines "$path/"
 			else
-				__print_line "$path"
+				__print_lines "$path"
 			fi
 		elif test -f "$path"; then
 			if [[ $path == */ ]]; then
 				length="${#path}"
-				__print_line "${path:0:length-1}"
+				__print_lines "${path:0:length-1}"
 			else
-				__print_line "$path"
+				__print_lines "$path"
 			fi
 		else
 			echo-style --error='Not a file nor directory:' ' ' --code="$path" >/dev/stderr