Make trim_path() handle "/", and arbitrarily many consecutive /:es.
authorTails developers <amnesia@boum.org>
Tue, 20 Mar 2012 16:36:18 +0000 (17:36 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 5 Apr 2012 05:49:58 +0000 (07:49 +0200)
scripts/live-helpers

index 1f2fb80..75fc106 100644 (file)
@@ -519,8 +519,9 @@ where_is_mounted ()
 }
 
 trim_path () {
-    # remove all unnecessary /:s in the path, including last
-    echo ${1} | sed 's|//|/|g' | sed 's|/$||'
+    # remove all unnecessary /:s in the path, including last one (except
+    # if path is just "/")
+    echo ${1} | sed 's|//\+|/|g' | sed 's|^\(.*[^/]\)/$|\1|'
 }
 
 what_is_mounted_on ()