moep
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'steven/issue/200'

This commit is contained in:
Nico Schottelius 2013-09-18 12:31:39 +02:00
parent 9925fee528 472198419a
commit ee519b878d
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cdist/test/fixtures/remote/copy vendored
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2012-2013 Nico Schottelius (nico-cdist schottelius.org) # 2012-2013 Nico Schottelius (nico-cdist schottelius.org)
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -22,9 +23,5 @@
# test cases # test cases
# #
recursive=$1; shift code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
src=$1; shift cp --dereference $code
dst=$1; shift
dst=$(echo $dst | sed "s/^${__target_host}://")
cp --dereference "$recursive" "$src" "$dst"

9
other/examples/remote/local/copy
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2012 Nico Schottelius (nico-cdist schottelius.org) # 2012 Nico Schottelius (nico-cdist schottelius.org)
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -19,9 +20,5 @@
# #
# #
recursive=$1; shift code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
src=$1; shift cp --dereference $code
dst=$1; shift
dst=$(echo $dst | sed "s/^${__target_host}://")
cp "$recursive" "$src" "$dst"