Clean deb-src on each build

[git-tools-moved-to-github.git] / id-deb-build / docker-build.sh

diff --git a/id-deb-build/docker-build.sh b/id-deb-build/docker-build.sh
index 662d761..c8bde88 100755 (executable)
--- a/id-deb-build/docker-build.sh
+++ b/id-deb-build/docker-build.sh
@@ -164,7 +164,7 @@ if $upload; then
        if test -n "${DEBIAN_DIST}"; then
            for dist in ${DEBIAN_DIST}; do
                ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/debian/${dist}"
-               if ! scp build/debian/${dist}/${PRODUCT}_* ${UPLOAD_URI}/debian/${dist}; then
+               if ! scp build/debian/${dist}/*_${VERSION}* ${UPLOAD_URI}/debian/${dist}; then
                    echo "Upload failed for $dist"
                    exit 1
                fi
@@ -173,7 +173,7 @@ if $upload; then
        if test -n "${UBUNTU_DIST}"; then
            for dist in ${UBUNTU_DIST}; do
                ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/ubuntu/${dist}"
-               if ! scp build/ubuntu/${dist}/${PRODUCT}_* ${UPLOAD_URI}/ubuntu/${dist}; then
+               if ! scp build/ubuntu/${dist}/*_${VERSION}* ${UPLOAD_URI}/ubuntu/${dist}; then
                    echo "Upload failed for $dist"
                    exit 1
                fi
@@ -217,6 +217,7 @@ if $debian; then
     if ! ${ID_DEB_BUILD}/id-mk-deb-changelog.sh; then
         echo "id-mk-deb-changelog.sh failed"
     fi
+    rm -fr deb-src
     if ! ${MKDEBSRC}; then
         echo "id-mk-deb-src.sh failed"
     fi
@@ -233,11 +234,10 @@ if $debian; then
     fi
 fi
 if test "${DEBIAN_DIST}"; then
-    prepare_deb debian ${DEBIAN_DIST}
+    prepare_deb debian "${DEBIAN_DIST}"
 fi
-
 if test "${UBUNTU_DIST}"; then
-    prepare_deb ubuntu ${UBUNTU_DIST}
+    prepare_deb ubuntu "${UBUNTU_DIST}"
 fi
 
 if test "${CENTOS_DIST}"; then
@@ -265,10 +265,10 @@ if test "${CENTOS_DIST}"; then
     done
 fi
 if test "${DEBIAN_DIST}"; then
-    run_deb debian ${DEBIAN_DIST}
+    run_deb debian "${DEBIAN_DIST}"
 fi
 if test "${UBUNTU_DIST}"; then
-    run_deb ubuntu ${UBUNTU_DIST}
+    run_deb ubuntu "${UBUNTU_DIST}"
 fi
 
 # Local Variables: