xanderio/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nico Schottelius 2013-09-18 12:31:39 +02:00
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
#
# 2012-2013 Nico Schottelius (nico-cdist schottelius.org)
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
#
# This file is part of cdist.
#
@ -22,9 +23,5 @@
# test cases
#
recursive=$1; shift
src=$1; shift
dst=$1; shift
dst=$(echo $dst | sed "s/^${__target_host}://")
cp --dereference "$recursive" "$src" "$dst"
code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
cp --dereference $code

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

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