ask, choose, confirm: comprehensive support of TTY modes and capabilities

commands/echo-mkdir → commands.beta/echo-mkdir

@@ -60,11 +60,11 @@ function echo_mkdir() (
 	# construct command
 	if test "$option_sudo" = 'yes'; then
 		function __mkdir {
-			sudo-helper --reason="Your sudo/root/login password is required to make the directory: $*" -- mkdir -p "$@"
+			sudo-helper --reason='Your sudo/root/login password is required to ensure the directory exists:' -- mkdir -p "$@"
 		}
 	else
 		function __mkdir {
-			mkdir -p
+			mkdir -p "$@"
 		}
 	fi
 

commands/echo-nothing-or-fail → commands.beta/echo-nothing-or-fail

@@ -48,7 +48,7 @@ function echo_nothing_or_fail() (
 		return 1 # failure
 	}
 
-	function on_on_lines {
+	function on_no_lines {
 		return 0 # success
 	}
 

commands.beta/edit-dns

@@ -42,7 +42,7 @@ function edit_dns() (
 
 	if get-app --quiet -- 'ProtonVPN'; then
 		__print_lines 'ProtonVPN enforces its own DNS'
-	elif command-exists -- dnscrypt-proxy; then
+	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

commands.beta/get-codec

@@ -8,7 +8,7 @@ function get_codec_test() (
 	ogg_media_file="$(fs-temp --directory='get-codec' --file --extension='ogg')"
 	down --url="$ogg_media_url" --filepath="$ogg_media_file"
 
-	if command-exists -- ffprobe; then
+	if __command_exists -- ffprobe; then
 		eval-tester --name='ogg vorbis file is ogg vorbis' --stdout='vorbis' \
 			-- get-codec --path="$ogg_media_file"
 	else
@@ -69,7 +69,7 @@ function get_codec() (
 	# =====================================
 	# Action
 
-	if ! command-exists -- ffprobe; then
+	if __command_missing -- ffprobe; then
 		echo-error 'ffprobe is required for this command.'
 		return 6 # ENXIO 6 No such device or address
 	fi

commands.beta/is-yum

@@ -35,7 +35,7 @@ function is_yum() (
 	# =====================================
 	# Action
 
-	command-exists -- yum
+	__command_exists -- yum
 )
 
 # fire if invoked standalone

commands.beta/macos-settings

@@ -225,7 +225,7 @@ function macos_settings() (
 	# Global
 
 	if is-needle --needle=screenshotdir -- "${choices[@]}"; then
-		mkdir -p "$HOME/Desktop/Screenshots"
+		__mkdirp "$HOME/Desktop/Screenshots"
 		defaults write com.apple.screencapture location "$HOME/Desktop/Screenshots"
 	else
 		defaults delete com.apple.screencapture location &>/dev/null || :

commands.beta/macos-state

@@ -207,7 +207,7 @@ function macos_state() (
 	}
 	function do_mkdir {
 		local path="$1"
-		mkdir -p "$(dirname "$path")"
+		__mkdirp "$(dirname "$path")"
 	}
 	function do_replace {
 		local path="$path"

commands.beta/pdf-decrypt

@@ -39,7 +39,7 @@ function pdf_decrypt() (
 	# =====================================
 	# Dependencies
 
-	if command-missing -- qpdf; then
+	if __command_missing -- qpdf; then
 		echo-style --error="[qpdf] is missing, install it first." >/dev/stderr
 		return 1
 	fi

commands.beta/setup-server

@@ -151,7 +151,7 @@ function setup_server() (
 			# ensure correct share user password
 			if test -n "$SHARE_PASSWORD"; then
 				printf '%s:%s\n' "$SHARE_USER" "$SHARE_PASSWORD" | sudo-helper -- chpasswd
-				if command-exists -- smbpasswd; then
+				if __command_exists -- smbpasswd; then
 					printf '%s\n%s\n' "$SHARE_PASSWORD" "$SHARE_PASSWORD" | sudo-helper -- smbpasswd -sa "$SHARE_USER"
 				fi
 			fi
@@ -430,7 +430,7 @@ function setup_server() (
 	}
 	function act_disconnect {
 		# shutdown and disable nord
-		if command-exists -- nordvpn; then
+		if __command_exists -- nordvpn; then
 			# stop vpn dependent
 			service-helper --ignore --stop -- "${services_vpn_dependent[@]}"
 
@@ -467,13 +467,13 @@ function setup_server() (
 			fi
 
 			# syncthing
-			if command-exists -- syncthing; then
+			if __command_exists -- syncthing; then
 				sudo ufw allow from 192.168.0.0/16 to any app syncthing || :     # local syncthing peers
 				sudo ufw allow from 192.168.0.0/16 to any app syncthing-gui || : # local syncthing gui
 			fi
 
 			# transmission
-			if command-exists -- transmission-daemon; then
+			if __command_exists -- transmission-daemon; then
 				sudo ufw allow from 192.168.0.0/16 to any port 51413 # local transmission peers
 				sudo ufw allow from 192.168.0.0/16 to any port 9091  # local transmission gui
 			fi
@@ -508,7 +508,7 @@ function setup_server() (
 		fi
 
 		# continue with nordvpn
-		if command-exists -- nordvpn; then
+		if __command_exists -- nordvpn; then
 			# ensure correctly configured
 			setup-util-nordvpn --quiet || :
 
@@ -593,7 +593,7 @@ function setup_server() (
 		local ec
 
 		# no nordvpn on this machine, so just check the internet is working
-		if command-missing -- nordvpn; then
+		if __command_missing -- nordvpn; then
 			is-internet-working
 			return 0
 		fi
@@ -642,7 +642,7 @@ function setup_server() (
 			-- resolvectl dns
 		eval-helper --no-quiet --wrap \
 			-- nslookup cloudflare.com
-		if command-exists -- nordvpn; then
+		if __command_exists -- nordvpn; then
 			eval-helper --no-quiet --wrap \
 				-- nordvpn status
 			eval-helper --no-quiet --wrap \

commands.beta/xps2pdf

@@ -74,7 +74,7 @@ function xps2pdf_() (
 		echo-style --bold="Converting " --code="$xps" --bold=" to " --code="$pdf"
 		gxps -sDEVICE=pdfwrite -sOutputFile="$pdf" -dNOPAUSE "$xps"
 
-		if command-exists -- GetFileInfo SetFile; then
+		if __command_exists -- GetFileInfo SetFile; then
 			ctime="$(GetFileInfo -m "$xps")"
 			SetFile -d "$ctime" "$pdf"
 		fi

commands.beta/ytd-helper

@@ -220,20 +220,20 @@ function ytd_helper() (
 
 	# handle tool
 	if test -z "$tool"; then
-		if command-exists -- 'yt-dlp'; then
+		if __command_exists -- 'yt-dlp'; then
 			tool='yt-dlp'
-		elif command-exists -- 'youtube-dl'; then
+		elif __command_exists -- 'youtube-dl'; then
 			tool='youtube-dl'
 		else
 			get-installer --first-success --invoke --quiet -- ytd-dlp youtube-dl
-			if command-exists -- 'yt-dlp'; then
+			if __command_exists -- 'yt-dlp'; then
 				tool='yt-dlp'
-			elif command-exists -- 'youtube-dl'; then
+			elif __command_exists -- 'youtube-dl'; then
 				tool='youtube-dl'
 			fi
 		fi
 	fi
-	if test -z "$tool" || command-missing -- "$tool"; then
+	if test -z "$tool" || __command_missing -- "$tool"; then
 		echo-error "tool [$tool] is not available"
 		return 3 # ESRCH 3 No such process
 	fi

commands/brew

@@ -43,12 +43,10 @@ function brew_() (
 			- disable brew environment hints, as Dorothy handles that better via [setup-environment-commands]
 		EOF
 		if test -z "$bin"; then
-			__print_line
-			echo-style --error='Homebrew is not installed.'
 			if is-mac; then
-				echo-style --error='Homebrew is not installed.' ' ' --notice='Install it with:' ' ' --code='setup-mac-brew'
+				echo-style --error1='Homebrew is not installed.' --notice1=' Install it with: ' --code-notice1='setup-mac-brew'
 			else
-				echo-style --error='Homebrew is not installed.'
+				echo-style --error1='Homebrew is not installed.'
 			fi
 			# ^ don't use get-installer, as bash v5 may not exist yet
 			return 74 # EPROGUNAVAIL 74 RPC prog. not avail

commands/btrfs-helper

@@ -73,7 +73,7 @@ function btrfs_helper() (
 	# =======================================================
 	# Dependencies
 
-	if command-missing -- btrfs; then
+	if __command_missing -- btrfs; then
 		setup-util-btrfs --quiet
 	fi
 

commands/checksum

@@ -6,7 +6,7 @@ function checksum_() (
 
 	local item algorithms=()
 	for item in 'md5sum' 'shasum' 'sha256sum'; do
-		if command-exists -- "$item"; then
+		if __command_exists -- "$item"; then
 			algorithms+=("$item")
 		fi
 	done