projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
161e3e6
)
Use trim_path() instead of custom sed stanza to trim /:es from paths.
author
Tails developers
<amnesia@boum.org>
Mon, 26 Mar 2012 17:21:40 +0000
(19:21 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Thu, 5 Apr 2012 05:54:42 +0000
(07:54 +0200)
scripts/live-helpers
patch
|
blob
|
history
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
d8bd613
..
ffc2025
100644
(file)
--- 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