diff options
| author | Camil Staps | 2015-10-29 13:43:35 +0100 |
|---|---|---|
| committer | Camil Staps | 2016-11-30 19:11:06 +0100 |
| commit | 7870e55153c333e1074a2a8f278052a62f03dc00 (patch) | |
| tree | e5098046838524d88cf08ff7c639837175a0b818 | |
| parent | submodule stuff (diff) | |
Fix bootstrap script
| -rwxr-xr-x | script/bootstrap | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/script/bootstrap b/script/bootstrap index 667c7e1..d6e0a30 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -53,7 +53,7 @@ setup_gitconfig () { link_directory () { local src=$1 dst=$2 - local overwrite= backup= skip= + local overwrite= backup= skip= remove= local action= if [ -f "$dst" -o -L "$dst" ] @@ -63,7 +63,7 @@ link_directory () { then user "Directory already exists: $dst ($(basename "$src")), what do you want to do?\n\ - [s]kip, [r]emove, [m]erge, [b]ackup?" + [s]kip, [r]emove, [b]ackup?" read -n 1 action case "$action" in @@ -71,8 +71,6 @@ link_directory () { skip=true;; r ) remove=true;; - m ) - merge=true;; b ) backup=true;; * ) @@ -104,7 +102,9 @@ link_directory () { if [ "$skip" != "true" ] then - for f in "$src/*" + mkdir -p "$dst" + + for f in "$src"/* do this_dst="$dst/$(basename "${f%.*}")" link "$f" "$this_dst" |