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

cleanup __cdist_dir

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-08-10 16:03:12 +02:00
commit b5b8bdc016
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/__cdist_dir
View file

@ -23,29 +23,24 @@
# Pull a directory from a target, both sides have the same name (i.e. explorers) # Pull a directory from a target, both sides have the same name (i.e. explorers)
# #
__cdist_dir() __cdist_dir()
{ {
[ $# -eq 3 ] || __cdist_usage "<push|pull> <src dir> <dst dir>" [ $# -eq 3 ] || __cdist_usage "<push|pull> <src dir> <dst dir>"
__cdist_dir_action="$1"; shift # ${3%/*} will be the destination directory, so no subdirectories
__cdist_dir_src="$1"; shift
__cdist_dir_dst="$1"; shift
# This will be the destination directory, so no subdirectories
# of the same name are created, if the directory is already existing # of the same name are created, if the directory is already existing
__cdist_dir_top="${__cdist_dir_dst%/*}"
if [ "$__cdist_dir_action" = "push" ]; then if [ "$1" = "push" ]; then
# FIXME: add error handling with __cdist_run_remote_... or so
ssh "${__cdist_remote_user}@${__cdist_target_host}" \ ssh "${__cdist_remote_user}@${__cdist_target_host}" \
"mkdir -p \"${__cdist_dir_dst}\"" "mkdir -p \"$3\""
scp -qr "$__cdist_dir_src" \ scp -qr "$2" \
"${__cdist_remote_user}@${__cdist_target_host}:${__cdist_dir_top}" "${__cdist_remote_user}@${__cdist_target_host}:${3%/*}"
elif [ "$__cdist_dir_action" = "pull" ]; then elif [ "$1" = "pull" ]; then
mkdir -p "${__cdist_dir_dst}" mkdir -p "$3"
scp -qr "${__cdist_remote_user}@${__cdist_target_host}:${__cdist_dir_src}" \ scp -qr "${__cdist_remote_user}@${__cdist_target_host}:$2" \
"${__cdist_dir_top}" "${3%/*}"
else else
__cdist_exit_err "Unknown action $__cdist_dir_action" __cdist_exit_err "Unknown action $1"
fi fi
} }