X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=03e48f0d05b319553f7234ea985dabfb34b526d9;hb=251565f8e624722d83691f1ca08615666c927f62;hp=abb65fdaaba78c3e072cb3ac823ab0c4ae7d2668;hpb=0c1eba64fee9348030e08b83df6ce7932c5dab79;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index abb65fd..03e48f0 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -43,6 +43,9 @@ while test $# -gt 0; do
         --upload)
 	    upload=true
 	    ;;
+        --remote=*)
+	    REMOTE=$optarg
+	    ;;
 	-*)
 	    do_help=yes
 	    ;;
@@ -54,6 +57,24 @@ if test "$do_help" = "yes"; then
     usage 1 1>&2
 fi
 
+if test "$REMOTE"; then
+    if test ! -d deb-src; then
+	echo "deb-src not in current directory"
+	exit 1
+    fi
+    cd deb-src
+    PRODUCT=`echo *.dsc|sed 's/_.*//g'`
+    cd ..
+    ssh $REMOTE "mkdir -p $PRODUCT/deb-src"
+    scp IDMETA $REMOTE:$PRODUCT
+    scp deb-src/*.gz deb-src/*.dsc $REMOTE:$PRODUCT/deb-src
+    if $upload; then
+	ssh $REMOTE "cd $PRODUCT; \$HOME/proj/git-tools/id-deb-build/id-pbuild.sh --upload"
+    else
+	ssh $REMOTE "cd $PRODUCT; sudo \$HOME/proj/git-tools/id-deb-build/id-pbuild.sh"
+    fi
+    exit 0
+fi
 if test -d deb-src; then
     cd deb-src
 fi
@@ -73,6 +94,11 @@ fi
 PBUILDER=/usr/sbin/pbuilder
 PRODUCT=`echo *.dsc|sed 's/_.*//g'`
 ARCHS="i386 amd64"
+if grep "Architecture: all" $PKG >/dev/null; then
+    USE_ARCHS=i386
+else
+    USE_ARCHS=$ARCHS
+fi
 echo "Dsc $PKG . Product $PRODUCT"
 echo "Ubuntu distros: $UBUNTU_DIST"
 echo "Debian distros: $DEBIAN_DIST"
@@ -89,10 +115,19 @@ if $upload; then
     echo "./update-archive.sh"
     exit 0
 fi
+# remove existing package directories
+for f in [a-z]*; do
+	if test -d $f; then
+		rm -fr $f
+	fi
+done
+rm -f *.log
+
 i=0
 date
+
 for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
-    for arch in ${ARCHS}; do
+    for arch in ${USE_ARCHS}; do
         rm -fr ${dist}-${arch}
 	(
 	    if test ! -f /var/cache/pbuilder/${dist}-${arch}-base.tgz; then
@@ -110,7 +145,7 @@ for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
 done
 wait
 for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
-    for arch in ${ARCHS}; do
+    for arch in ${USE_ARCHS}; do
 	if test -f ${dist}-${arch}/*.dsc; then
 	    :
 	else