Skip to content

Commit

Permalink
Use trim_path() instead of custom sed stanza to trim /:es from paths.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tails developers authored and daniel-baumann committed Apr 5, 2012
1 parent 161e3e6 commit 268ad5d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/live-helpers
Expand Up @@ -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
Expand Down

0 comments on commit 268ad5d

Please sign in to comment.