mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
(1) Be a little less picky about finding read-only mounts.
(2) Create directories before trying to copy files over. (3) There's no -a option to scp anymore.
This commit is contained in:
parent
6859437a17
commit
df6b4a0473
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=26926
@ -3,8 +3,8 @@ if [ $# != 4 ]; then
|
||||
echo "usage: $0 master portbuilddir branch md5"
|
||||
exit 1
|
||||
fi
|
||||
if [ $(echo $(/sbin/mount | grep "$2/.*(read-only)" | awk '{print $3}' | wc -c)) != 0 ]; then
|
||||
/sbin/umount -f $(/sbin/mount | grep "$2/.*(read-only)" | awk '{print $3}')
|
||||
if [ $(echo $(/sbin/mount | grep "$2/.*read-only" | awk '{print $3}' | wc -c)) != 0 ]; then
|
||||
/sbin/umount -f $(/sbin/mount | grep "$2/.*read-only" | awk '{print $3}')
|
||||
fi
|
||||
|
||||
if ! rm -rf $2/*/chroot/* >/dev/null 2>&1; then
|
||||
@ -12,11 +12,13 @@ if ! rm -rf $2/*/chroot/* >/dev/null 2>&1; then
|
||||
rm -rf $2/*/chroot/*
|
||||
fi
|
||||
|
||||
scp -p -a $1:$2/scripts/portbuild $2/scripts
|
||||
mkdir -p $2/scripts $2/$3/tarballs $2/$3/chroot
|
||||
|
||||
scp -p $1:$2/scripts/portbuild $2/scripts
|
||||
md5=$(/sbin/md5 $2/$3/tarballs/bindist.tar | awk '{print $4}')
|
||||
if [ "$md5" = "$4" ]; then
|
||||
echo "not copying bindist to $(hostname -s) since it is already up to date"
|
||||
else
|
||||
echo "copying bindist to $(hostname -s)"
|
||||
scp -p -a $1:$2/$3/tarballs/bindist.tar $2/$3/tarballs
|
||||
scp -p $1:$2/$3/tarballs/bindist.tar $2/$3/tarballs
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user