From 82b7268f8f52e3b3dca3bccc23b10ccba7fbb866 Mon Sep 17 00:00:00 2001
From: VlkrS <47375452+VlkrS@users.noreply.github.com>
Date: Sun, 1 Jan 2023 12:20:42 +0100
Subject: [PATCH 1/2] Make non-portable uses of mkdir, grep and tree
 configurable

---
 src/password-store.sh   | 22 +++++++++++++++-------
 src/platform/openbsd.sh |  3 +++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/password-store.sh b/src/password-store.sh
index 83549ef..47fa1ca 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -204,6 +204,9 @@ tmpdir() {
 GETOPT="getopt"
 SHRED="shred -f -z"
 BASE64="base64"
+MKDIR="mkdir -v"
+TREE="tree"
+GREPCOLOR="--color=always"
 
 source "$(dirname "$0")/platform/$(uname | cut -d _ -f 1 | tr '[:upper:]' '[:lower:]').sh" 2>/dev/null # PLATFORM_FUNCTION_FILE
 
@@ -313,7 +316,10 @@ cmd_show() {
 		else
 			echo "${path%\/}"
 		fi
-		tree -N -C -l --noreport "$PREFIX/$path" | tail -n +2 | sed -E 's/\.age(\x1B\[[0-9]+m)?( ->|$)/\1\2/g' # remove .age at end of line, but keep colors
+		# remove .age at end of line, but keep colors
+		${TREE} -N -C -l --noreport "$PREFIX/$path" \
+			| tail -n +2 \
+			| sed -E 's/\.age(\x1B\[[0-9]+m)?( ->|$)/\1\2/g' 
 	elif [[ -z $path ]]; then
 		die "Error: password store is empty."
 	else
@@ -325,14 +331,16 @@ cmd_find() {
 	[[ $# -eq 0 ]] && die "Usage: $PROGRAM $COMMAND pass-names..."
 	IFS="," eval 'echo "Search Terms: $*"'
 	local terms="*$(printf '%s*|*' "$@")"
-	tree -N -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed -E 's/\.age(\x1B\[[0-9]+m)?( ->|$)/\1\2/g'
+	${TREE} -N -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" \
+		| tail -n +2 \
+		| sed -E 's/\.age(\x1B\[[0-9]+m)?( ->|$)/\1\2/g'
 }
 
 cmd_grep() {
 	[[ $# -lt 1 ]] && die "Usage: $PROGRAM $COMMAND [GREPOPTIONS] search-string"
 	local passfile grepresults
 	while read -r -d "" passfile; do
-		grepresults="$($AGE -d -i "$IDENTITIES_FILE" "$passfile" | grep --color=always "$@")"
+		grepresults="$($AGE -d -i "$IDENTITIES_FILE" "$passfile" | grep ${GREPCOLOR} "$@")"
 		[[ $? -ne 0 ]] && continue
 		passfile="${passfile%.age}"
 		passfile="${passfile#$PREFIX/}"
@@ -364,7 +372,7 @@ cmd_insert() {
 
 	[[ $force -eq 0 && -e $passfile ]] && yesno "An entry already exists for $path. Overwrite it?"
 
-	mkdir -p -v "$PREFIX/$(dirname -- "$path")"
+	${MKDIR} -p "$PREFIX/$(dirname -- "$path")"
 	set_age_recipients "$(dirname -- "$path")"
 
 	if [[ $multiline -eq 1 ]]; then
@@ -398,7 +406,7 @@ cmd_edit() {
 
 	local path="${1%/}"
 	check_sneaky_paths "$path"
-	mkdir -p -v "$PREFIX/$(dirname -- "$path")"
+	${MKDIR} -p "$PREFIX/$(dirname -- "$path")"
 	set_age_recipients "$(dirname -- "$path")"
 	local passfile="$PREFIX/$path.age"
 	set_git "$passfile"
@@ -440,7 +448,7 @@ cmd_generate() {
 	check_sneaky_paths "$path"
 	[[ $length =~ ^[0-9]+$ ]] || die "Error: pass-length \"$length\" must be a number."
 	[[ $length -gt 0 ]] || die "Error: pass-length must be greater than zero."
-	mkdir -p -v "$PREFIX/$(dirname -- "$path")"
+	${MKDIR} -p "$PREFIX/$(dirname -- "$path")"
 	set_age_recipients "$(dirname -- "$path")"
 	local passfile="$PREFIX/$path.age"
 	set_git "$passfile"
@@ -529,7 +537,7 @@ cmd_copy_move() {
 	echo "$old_path"
 	[[ -e $old_path ]] || die "Error: $1 is not in the password store."
 
-	mkdir -p -v "${new_path%/*}"
+	${MKDIR} -p "${new_path%/*}"
 	[[ -d $old_path || -d $new_path || $new_path == */ ]] || new_path="${new_path}.age"
 
 	local interactive="-i"
diff --git a/src/platform/openbsd.sh b/src/platform/openbsd.sh
index b808e31..95d0972 100644
--- a/src/platform/openbsd.sh
+++ b/src/platform/openbsd.sh
@@ -5,3 +5,6 @@
 GETOPT="gnugetopt"
 SHRED="rm -P -f"
 BASE64="openssl base64"
+MKDIR="mkdir"
+TREE="colortree"
+GREPCOLOR=
\ No newline at end of file

From 8f7e48caea48a11d361d479ec7cb86fbdf876f2b Mon Sep 17 00:00:00 2001
From: VlkrS <47375452+VlkrS@users.noreply.github.com>
Date: Sun, 1 Jan 2023 12:20:42 +0100
Subject: [PATCH 2/2] Make non-portable uses of mkdir, grep and tree
 configurable

---
 src/platform/openbsd.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/platform/openbsd.sh b/src/platform/openbsd.sh
index 95d0972..3f1e373 100644
--- a/src/platform/openbsd.sh
+++ b/src/platform/openbsd.sh
@@ -7,4 +7,5 @@ SHRED="rm -P -f"
 BASE64="openssl base64"
 MKDIR="mkdir"
 TREE="colortree"
-GREPCOLOR=
\ No newline at end of file
+GREPCOLOR=
+