X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=c04e2d76d33fbf3174a91fd721c422f1105bc2eb;hb=d95607bfe6ae4d9219885c9c283582693f0e168b;hp=fdb144268c4da7a6050dd7f31e59923789dffbef;hpb=cd209730f560d38dc77e0dd9b2d940a2a7b3dd5e;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index fdb1442..c04e2d7 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -72,13 +72,23 @@ if test ! -x $MKDEBSRC; then
     exit 1
 fi
 
-if test -d deb-src; then
+if $upload; then
     cd deb-src
 else
-    $MKDEBSRC
-fi
-
-if test -d deb-src; then
+    if test "${SUDO_USER}"; then
+	if test ! -d deb-src; then
+	    $MKDEBSRC
+	fi
+    else
+	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
     cd deb-src
 fi
 
@@ -109,10 +119,11 @@ echo "Ubuntu distros: $UBUNTU_DIST"
 echo "Debian distros: $DEBIAN_DIST"
 if test "${SUDO_USER}"; then
     echo "Running as sudo."
-    echo "You can avoid it by adding the following in /etc/sudoers"
+    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
@@ -144,6 +155,12 @@ rm -f *.log
 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
 
@@ -161,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
@@ -173,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