X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=656b37475e23a608cc079745faceb1b557215b05;hb=59853e1a8164b9fab87c694f63076796849da3ac;hp=b9cd94da2854467ff9b5fc7b3c3ecc0db346422a;hpb=5800761f8be3c0ec6fddf74327d75b5505e14a89;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index b9cd94d..656b374 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -58,15 +58,39 @@ if test "$do_help" = "yes"; then
     usage 1 1>&2
 fi
 
-PBUILDROOT=`dirname $0`/id-pbuild-root.sh
+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
 
-if test -d deb-src; then
-    cd deb-src
+MKDEBSRC=${ID_DEB_BUILD}/id-mk-deb-src.sh
+if test ! -x $MKDEBSRC; then
+    echo "$MKDEBSRC not found"
+    exit 1
+fi
+
+if $upload; then
+    :
+else
+    if test "${SUDO_USER}"; then
+	if test ! -d deb-src; then
+	    $MKDEBSRC
+	fi
+    else
+	if test -d deb-src; then
+	    rm -f deb-src/*.gz
+	    if test $? -ne 0; then
+		echo "deb-src could not be removed. Remove deb-src manually"
+		exit 1
+	    fi
+	fi
+	$MKDEBSRC
+    fi
 fi
+cd deb-src
 
 for f in *.dsc; do
     if test -f "$f"; then
@@ -93,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}
@@ -113,12 +151,25 @@ if $upload; then
 fi
 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
-	sudo -n $PBUILDROOT \
+	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
@@ -127,7 +178,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
 	fi
@@ -139,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