mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-27 12:22:09 +00:00
f689adb7a3
use cmp in a loop instead of diff -N to compare directories. The former works on more platforms for Portable. OpenBSD-Regress-ID: c3aa72807f9c488e8829a26ae50fe5bcc5b57099
71 lines
2.0 KiB
Bash
71 lines
2.0 KiB
Bash
# $OpenBSD: scp-uri.sh,v 1.2 2017/12/11 11:41:56 dtucker Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="scp-uri"
|
|
|
|
#set -x
|
|
|
|
COPY2=${OBJ}/copy2
|
|
DIR=${COPY}.dd
|
|
DIR2=${COPY}.dd2
|
|
|
|
SRC=`dirname ${SCRIPT}`
|
|
cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
|
|
chmod 755 ${OBJ}/scp-ssh-wrapper.scp
|
|
scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
|
|
export SCP # used in scp-ssh-wrapper.scp
|
|
|
|
scpclean() {
|
|
rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
|
|
mkdir ${DIR} ${DIR2}
|
|
}
|
|
|
|
# Remove Port and User from ssh_config, we want to rely on the URI
|
|
cp $OBJ/ssh_config $OBJ/ssh_config.orig
|
|
egrep -v '^ +(Port|User) +.*$' $OBJ/ssh_config.orig > $OBJ/ssh_config
|
|
|
|
verbose "$tid: simple copy local file to remote file"
|
|
scpclean
|
|
$SCP $scpopts ${DATA} "scp://${USER}@somehost:${PORT}/${COPY}" || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tid: simple copy remote file to local file"
|
|
scpclean
|
|
$SCP $scpopts "scp://${USER}@somehost:${PORT}/${DATA}" ${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tid: simple copy local file to remote dir"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts ${COPY} "scp://${USER}@somehost:${PORT}/${DIR}" || fail "copy failed"
|
|
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
|
|
|
|
verbose "$tid: simple copy remote file to local dir"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts "scp://${USER}@somehost:${PORT}/${COPY}" ${DIR} || fail "copy failed"
|
|
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
|
|
|
|
verbose "$tid: recursive local dir to remote dir"
|
|
scpclean
|
|
rm -rf ${DIR2}
|
|
cp ${DATA} ${DIR}/copy
|
|
$SCP $scpopts -r ${DIR} "scp://${USER}@somehost:${PORT}/${DIR2}" || fail "copy failed"
|
|
for i in $(cd ${DIR} && echo *); do
|
|
cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
|
|
done
|
|
|
|
verbose "$tid: recursive remote dir to local dir"
|
|
scpclean
|
|
rm -rf ${DIR2}
|
|
cp ${DATA} ${DIR}/copy
|
|
$SCP $scpopts -r "scp://${USER}@somehost:${PORT}/${DIR}" ${DIR2} || fail "copy failed"
|
|
for i in $(cd ${DIR} && echo *); do
|
|
cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
|
|
done
|
|
|
|
# TODO: scp -3
|
|
|
|
scpclean
|
|
rm -f ${OBJ}/scp-ssh-wrapper.exe
|