From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 9 May 2012 11:31:05 +0000 (+0200)
Subject: id-pbuild.sh: allow deb-src to be already present
X-Git-Url: http://git.indexdata.com/?p=git-tools-moved-to-github.git;a=commitdiff_plain;h=59853e1a8164b9fab87c694f63076796849da3ac

id-pbuild.sh: allow deb-src to be already present
---

diff --git a/id-deb-build/id-mk-deb-src.sh b/id-deb-build/id-mk-deb-src.sh
index 4e351bb..c63e772 100755
--- a/id-deb-build/id-mk-deb-src.sh
+++ b/id-deb-build/id-mk-deb-src.sh
@@ -11,10 +11,6 @@ fi
 if test -f debian/.gitignore; then
 	cd debian; for i in `cat .gitignore`; do rm -fr $i; done; cd ..
 fi
-if test -d deb-src; then
-	echo "deb-src exist. You might remove it"
-	exit 1
-fi
 l=`head -1 $DEBCHANGELOG`
 PROD=`echo $l|sed 's/ .*//g'`
 VERSION=`echo $l|sed 's/.*(//g'|sed 's/).*//g'`
@@ -29,7 +25,7 @@ if test ! -f ${TAR}; then
 	exit 1
 fi
 set -e
-mkdir deb-src
+mkdir -p deb-src
 ORIG=${PROD}_${MAJOR}.orig.tar.gz
 echo "TAR=$TAR"
 echo "ORIG=$ORIG"
diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index c04e2d7..656b374 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -73,7 +73,7 @@ if test ! -x $MKDEBSRC; then
 fi
 
 if $upload; then
-    cd deb-src
+    :
 else
     if test "${SUDO_USER}"; then
 	if test ! -d deb-src; then
@@ -81,7 +81,7 @@ else
 	fi
     else
 	if test -d deb-src; then
-	    rm -rf deb-src
+	    rm -f deb-src/*.gz
 	    if test $? -ne 0; then
 		echo "deb-src could not be removed. Remove deb-src manually"
 		exit 1
@@ -89,8 +89,8 @@ else
 	fi
 	$MKDEBSRC
     fi
-    cd deb-src
 fi
+cd deb-src
 
 for f in *.dsc; do
     if test -f "$f"; then