diff options
| author | Tails developers <amnesia@boum.org> | 2012-03-26 19:21:40 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 07:54:42 +0200 |
| commit | 268ad5d5b86fa0d7d7202a96113ef5167d855ec7 (patch) | |
| tree | 44b23d1e1df56c20afb10f971cb790df8122b7b1 /scripts | |
| parent | 161e3e634a4f975f4d72fc2cfd715d9741fe9d16 (diff) | |
| download | live-boot-268ad5d5b86fa0d7d7202a96113ef5167d855ec7.tar.gz live-boot-268ad5d5b86fa0d7d7202a96113ef5167d855ec7.zip | |
Use trim_path() instead of custom sed stanza to trim /:es from paths.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 4 |
1 files changed, 2 insertions, 2 deletions
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 |