Merge branch 'cherry-pick-e0841bce' into 'master'

Merge branch '386-libstd-bugs-in-std-append_path-and-std-prepend_path' into '1.1.22' See merge request Pmodules/src!413
2026-06-30 19:29:38 +02:00 · 2025-02-04 16:26:34 +01:00
parent 4f1a134c90 9028999da5
commit e0c3d33805
1 changed files with 3 additions and 1 deletions
@@ -285,6 +285,7 @@ std::append_path () {
 		[[ "${path}" == @(|*:)${dir}@(|:*) ]] && continue
 		dirs+="${dir}:"
 	done
+	[[ -n "${dirs}" ]] || return 0

 	# assemble new path
 	dirs="${dirs%:}"		# remove leading ':'
@@ -308,12 +309,13 @@ std::prepend_path () {
 		[[ "${path}" == @(|*:)${dir}@(|:*) ]] && continue
 		dirs+="${dir}:"
 	done
+	[[ -n "${dirs}" ]] || return 0

 	# assemble new path
 	dirs="${dirs%:}"		# remove leading ':'
        if [[ -z ${path} ]]; then
                path="${dirs}"
-        else
+	else
 		path="${dirs}:${path}"
        fi
 }