etc/sh/rc: Finalize path_add() function

1 files changed, 16 insertions, 16 deletions

diff --git a/etc/sh/rc b/etc/sh/rc
index c5007e6..c894be6 100644
--- a/etc/sh/rc
+++ b/etc/sh/rc
@@ -18,19 +18,17 @@ if [ -r "$GUIX_PROFILE"/etc/profile ]; then
 	. "$GUIX_PROFILE"/etc/profile
 fi
 
-idempotent_path_add() {
-	case "$(eval "echo \$$1")" in
-		*"$2"*)
+path_add() {
+	case ":$2:" in
+		*:"$3":*)
 			;;
 		*)
-			eval "export $1=$2\${$1:+:}\${$1:-}"
+			eval "export $1=$3\${$1:+:}\${$1:-}"
 			;;
 	esac
 }
-export A="$HOME${A:+:}${A:-}"
-# idempotent_path_add B "$HOME"
+
 export XDG_DATA_DIRS="$XDG_DATA_HOME/flatpak/exports/share:/var/lib/flatpak/exports/share${XDG_DATA_DIRS:+:}${XDG_DATA_DIRS:-}"
-# idempotent_path_add XDG_DATA_DIRS "$XDG_DATA_HOME/flatpak/exports/share"
 
 
 
@@ -94,21 +92,23 @@ export GPODDER_HOME="$XDG_DATA_HOME"/gPodder
 export GPODDER_DOWNLOAD_DIR="${XDG_DOWNLOAD_DIR:-$HOME/Downloads}"/gPodder
 
 add_prefix() {
-	export GUILE_LOAD_PATH="$1/share/guile/site/$GUILE_EFFECTIVE_VERSION${GUILE_LOAD_PATH:+:}${GUILE_LOAD_PATH:-:}"
-	export GUILE_LOAD_COMPILED_PATH="$1/lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache${GUILE_LOAD_COMPILED_PATH:+:}${GUILE_LOAD_COMPILED_PATH:-}"
-	export C_INCLUDE_PATH="$1/include${C_INCLUDE_PATH:+:}${C_INCLUDE_PATH:-}"
-	export LIBRARY_PATH="$1/lib${LIBRARY_PATH:+:}${LIBRARY_PATH:-}"
-	export INFOPATH="$1/share/info${INFOPATH:+:}${INFOPATH:-}"
-	export MANPATH="$1/share/man${MANPATH:+:}${MANPATH:-}"
-	export DICPATH="$1/share/hunspell${DICPATH:+:}${DICPATH:-}"
-	export PATH="$1/bin${PATH:+:}${PATH:-}"
+	path_add GUILE_LOAD_PATH          "$GUILE_LOAD_PATH"          "$1/share/guile/site/$GUILE_EFFECTIVE_VERSION"
+	path_add GUILE_LOAD_COMPILED_PATH "$GUILE_LOAD_COMPILET_PATH" "$1/lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
+
+	path_add C_INCLUDE_PATH "$C_INCLUDE_PATH" "$1/include"
+	path_add LIBRARY_PATH   "$LIBRARY_PATH"   "$1/lib"
+
+	path_add INFOPATH "$INFOPATH" "$1/share/info"
+	path_add MANPATH  "$MANPATH"  "$1/share/man"
+	path_add DICPATH  "$DICPATH"  "$1/share/hunspell"
+	path_add PATH     "$PATH"     "$1/bin"
 }
 export PREFIX="$XDG_PREFIX/var/mkg"
 add_prefix "$PREFIX"
 add_prefix "$XDG_PREFIX"
 
 for d in "$XDG_PREFIX"/opt/bin-dirs/*; do
-	PATH="$d:$PATH"
+	path_add PATH "$PATH" "$d"
 done