[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk Allow clients to be specified with port...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e1eddb0fdce
branches:  trunk
changeset: 652788:9e1eddb0fdce
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 07 22:49:04 2015 +0000

description:
Allow clients to be specified with port number, simplifying multi-chroot
setups.

diffstat:

 pkgtools/pbulk/Makefile                               |   4 ++--
 pkgtools/pbulk/files/pbulk/scripts/build-client-start |  12 ++++++++++--
 pkgtools/pbulk/files/pbulk/scripts/scan-client-start  |  12 ++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 8db8a2ba7bc8 -r 9e1eddb0fdce pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Sun Jun 07 22:47:51 2015 +0000
+++ b/pkgtools/pbulk/Makefile   Sun Jun 07 22:49:04 2015 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2014/11/24 01:08:02 asau Exp $
+# $NetBSD: Makefile,v 1.70 2015/06/07 22:49:04 joerg Exp $
 
-PKGNAME=       pbulk-0.53
+PKGNAME=       pbulk-0.54
 COMMENT=       Modular bulk build framework
 
 .include "../../pkgtools/pbulk/Makefile.common"
diff -r 8db8a2ba7bc8 -r 9e1eddb0fdce pkgtools/pbulk/files/pbulk/scripts/build-client-start
--- a/pkgtools/pbulk/files/pbulk/scripts/build-client-start     Sun Jun 07 22:47:51 2015 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/build-client-start     Sun Jun 07 22:49:04 2015 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: build-client-start,v 1.2 2008/09/16 18:21:30 joerg Exp $
+# $NetBSD: build-client-start,v 1.3 2015/06/07 22:49:04 joerg Exp $
 
 . @PBULK_CONFIG@
 
@@ -12,5 +12,13 @@
 fi
 
 for client in ${build_clients}; do
-       ssh $client "${pbuild} -c ${master_port_build} -b ${pbuild_script}" &
+       case ${client} in 
+       *:*)
+               port="-p ${client##*:}"
+               client=${client%%:*}
+               ;;
+       *)
+               ;;
+       esac
+       ssh $port $client "${pbuild} -c ${master_port_build} -b ${pbuild_script}" &
 done
diff -r 8db8a2ba7bc8 -r 9e1eddb0fdce pkgtools/pbulk/files/pbulk/scripts/scan-client-start
--- a/pkgtools/pbulk/files/pbulk/scripts/scan-client-start      Sun Jun 07 22:47:51 2015 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/scan-client-start      Sun Jun 07 22:49:04 2015 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: scan-client-start,v 1.3 2012/11/23 12:13:35 joerg Exp $
+# $NetBSD: scan-client-start,v 1.4 2015/06/07 22:49:04 joerg Exp $
 
 . @PBULK_CONFIG@
 
@@ -18,5 +18,13 @@
 fi
 
 for client in ${scan_clients}; do
-       ssh $client "${pscan_prepare} && ${pscan} -c ${master_port_scan} -M ${make} ${extra_pscan_args} ${pkgsrc}" &
+       case ${client} in 
+       *:*)
+               port="-p ${client##*:}"
+               client=${client%%:*}
+               ;;
+       *)
+               ;;
+       esac
+       ssh $port $client "${pscan_prepare} && ${pscan} -c ${master_port_scan} -M ${make} ${extra_pscan_args} ${pkgsrc}" &
 done