From 268ad5d5b86fa0d7d7202a96113ef5167d855ec7 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Mon, 26 Mar 2012 19:21:40 +0200
Subject: Use trim_path() instead of custom sed stanza to trim /:es from paths.

---
 scripts/live-helpers | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/live-helpers b/scripts/live-helpers
index d8bd613..ffc2025 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1158,8 +1158,8 @@ link_files ()
 	# live-boot normally does (into $rootmnt)).
 
 	# remove multiple /:s and ensure ending on /
-	local src_dir="$(echo "${1}"/ | sed -e 's|/\+|/|g')"
-	local dest_dir="$(echo "${2}"/ | sed -e 's|/\+|/|g')"
+	local src_dir="$(trim_path ${1})/"
+	local dest_dir="$(trim_path ${2})/"
 	local src_mask="${3}"
 
 	# This check can only trigger on the inital, non-recursive call since
-- 
cgit v1.2.3