X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=c04e2d76d33fbf3174a91fd721c422f1105bc2eb;hb=d514303a3a989de668eb456ca9c3534f6260c71d;hp=888b482b437e0912a609042229d4698424e4d2c2;hpb=c81a19dfdf091306ed974b9c60e6cfaa152048f9;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index 888b482..c04e2d7 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -6,7 +6,7 @@
 usage()
 {
     cat <<EOF
-Usage: id-pbuild-all.sh [OPTIONS]
+Usage: id-pbuild.sh [OPTIONS]
 Options:
 	[--debian=distros]
 	[--ubuntu=distros]
@@ -47,9 +47,6 @@ while test $# -gt 0; do
         --product=*)
 	    PRODUCT=$optarg
 	    ;;
-        --remote=*)
-	    REMOTE=$optarg
-	    ;;
 	-*)
 	    do_help=yes
 	    ;;
@@ -61,27 +58,40 @@ 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
+D0=`dirname $0`
+ID_DEB_BUILD=`cd $D0; pwd`
+PBUILDROOT=${ID_DEB_BUILD}/id-pbuild-root.sh
+if test ! -x $PBUILDROOT; then
+    echo "$PBUILDROOT not found"
+    exit 1
+fi
+
+MKDEBSRC=${ID_DEB_BUILD}/id-mk-deb-src.sh
+if test ! -x $MKDEBSRC; then
+    echo "$MKDEBSRC not found"
+    exit 1
+fi
+
+if $upload; then
     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
+    if test "${SUDO_USER}"; then
+	if test ! -d deb-src; then
+	    $MKDEBSRC
+	fi
     else
-	ssh $REMOTE "cd $PRODUCT; sudo \$HOME/proj/git-tools/id-deb-build/id-pbuild.sh"
+	if test -d deb-src; then
+	    rm -rf deb-src
+	    if test $? -ne 0; then
+		echo "deb-src could not be removed. Remove deb-src manually"
+		exit 1
+	    fi
+	fi
+	$MKDEBSRC
     fi
-    exit 0
-fi
-if test -d deb-src; then
     cd deb-src
 fi
+
 for f in *.dsc; do
     if test -f "$f"; then
 	PKG=$f
@@ -95,9 +105,8 @@ if test ! -e "$PKG"; then
     echo "${PKG} does not exist"
     exit 1
 fi
-PBUILDER=/usr/sbin/pbuilder
 if test -z "$PRODUCT"; then
-	PRODUCT=`echo *.dsc|sed 's/_.*//g'`
+    PRODUCT=`echo *.dsc|sed 's/_.*//g'`
 fi
 ARCHS="i386 amd64"
 if grep "Architecture: all" $PKG >/dev/null; then
@@ -108,6 +117,20 @@ fi
 echo "Dsc $PKG . Product $PRODUCT"
 echo "Ubuntu distros: $UBUNTU_DIST"
 echo "Debian distros: $DEBIAN_DIST"
+if test "${SUDO_USER}"; then
+    echo "Running as sudo."
+    echo "Tip: You can avoid it by adding the following in /etc/sudoers"
+    echo "${SUDO_USER} ALL=NOPASSWD: ${ID_DEB_BUILD}/id-pbuild-root.sh"
+    HOME_EXPORT=/home/${SUDO_USER}
+else
+    sudo -k
+    HOME_EXPORT=$HOME
+fi
+if test ! -f ${HOME_EXPORT}/.pbuilderrc; then
+    echo "${HOME_EXPORT}/.pbuilderrc missing"
+    exit 1
+fi
+
 if $upload; then
     for dist in ${UBUNTU_DIST}; do
 	scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/ubuntu/${dist}
@@ -126,31 +149,38 @@ if $upload; then
     echo "===================================================="
     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
 
+# call our privileged wrapper to clean the directories, no --dsc option
+for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
+    for arch in ${USE_ARCHS}; do
+	sudo -n $PBUILDROOT --home=${HOME_EXPORT} --dist=$dist --arch=$arch
+	if test $? -ne 0; then
+	    echo "FAILED"
+	    echo "Run id-pbuild.sh using sudo or add yourself to /etc/sudoers:"
+	    echo "${USER} ALL=NOPASSWD: ${ID_DEB_BUILD}/id-pbuild-root.sh"
+	    exit 1
+	fi
+    done
+done
+
+# call our privileged wrapper to do the real work, with --dsc option
 i=0
 date
-
 for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
     for arch in ${USE_ARCHS}; do
-        rm -fr ${dist}-${arch}
-	(
-	    if test ! -f /var/cache/pbuilder/${dist}-${arch}-base.tgz; then
-		DIST=$dist ARCH=$arch $PBUILDER create
-	    fi
-	    DIST=$dist ARCH=$arch $PBUILDER update --override-config
-	    DIST=$dist ARCH=$arch $PBUILDER --build $PKG
-	    ) >${dist}-${arch}.log 2>&1 &
+	sudo -n $PBUILDROOT --home=${HOME_EXPORT} \
+	    --dist=$dist --arch=$arch --dsc=$PKG >${dist}-${arch}.log 2>&1 &
 	i=`expr $i + 1`
 	if test $i -eq $concurrency; then
 	    i=0
 	    wait
+	    if test -f ${dist}-${arch}/*.dsc; then
+		:
+	    else
+		echo "FAILED: No .dsc file for ${dist}-${arch}"
+		exit 1
+	    fi
 	fi
     done
 done
@@ -160,7 +190,7 @@ for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
 	if test -f ${dist}-${arch}/*.dsc; then
 	    :
 	else
-	    echo "No .dsc file for ${dist}-${arch}"
+	    echo "FAILED: No .dsc file for ${dist}-${arch}"
 	    exit 1
 	fi
     done