From 7a8eabff4eab223553420e5ee3857d15b84559a1 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Mon, 20 Feb 2012 11:51:14 +0100 Subject: [PATCH] Use trim_path when we compare paths. --- scripts/live-helpers | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/live-helpers b/scripts/live-helpers index 26783f1..795de55 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -1306,8 +1306,8 @@ get_custom_mounts () done # ensure that no multiple-/ occur in paths - local full_source="$(echo ${backing}/${source}/ | sed -e 's|/\+|/|g')" - local full_dest="$(echo ${rootmnt}/${dest}/ | sed -e 's|/\+|/|g')" + local full_source="$(trim_path ${backing}/${source})" + local full_dest="$(trim_path ${rootmnt}/${dest})" device_used="yes" if echo ${options} | grep -qe "\"; then @@ -1373,7 +1373,7 @@ do_custom_mounts () # FIXME: this should really be handled by # live-config since we don't know for sure # which uid a certain user has until then - if echo ${dest} | grep -qe "^${rootmnt}/*home/\+[^/]\+" + if trim_path ${dest} | grep -qe "^${rootmnt}/*home/[^/]\+" then path="/" for dir in $(echo ${dest} | sed -e 's|/\+| |g')