Option to specify what to trim

`trim`, `rtrim` and `ltrim` now all accept a second argument: a regex specifying what to trim. If no second arg is passed, they default to `[:space:]` as before. Also got rid of superfluous subshelling.
kopischke · Apr 9, 2013 · 30bda2e · 30bda2e
1 parent eb278b4
commit 30bda2e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/lib/strings.sh b/src/lib/strings.sh
@@ -38,13 +38,16 @@ function match {
 }
 
 function ltrim {
-	echo "$(match '[^[:space:]].*' "$1")"
+	local to_trim="${2:-[:space:]}"
+	match "[^$to_trim].*$" "$1"
 }
 
 function rtrim {
-	echo "$(match '[^[:space:]].*$' "$1")"
+	local to_trim="${2:-[:space:]}"
+	match "^.*[^$to_trim]" "$1"
 }
 
 function trim {
-	echo "$(match '[^[:space:]](.*[^[:space:]])?' "$1")"
+	local to_trim="${2:-[:space:]}"
+	match "[^$to_trim](.*[^$to_trim])?" "$1"
 }