Quote strings to be empty tested

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

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index ce96760..8e131a6 100755 (executable)
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -32,16 +32,15 @@ while test $# -gt 0; do
        -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
        *) optarg= ;;
     esac
-    
     case $1 in
        --debian=*)
-           DEBIAN_DIST=$optarg
+           DEBIAN_DIST_A=$optarg
            ;;
        --ubuntu=*)
-           UBUNTU_DIST=$optarg
+           UBUNTU_DIST_A=$optarg
            ;;
        --centos=*)
-           CENTOS_DIST=$optarg
+           CENTOS_DIST_A=$optarg
            ;;
         --upload)
            upload=true
@@ -55,10 +54,16 @@ while test $# -gt 0; do
        -*)
            do_help=yes
            ;;
-    esac 
+    esac
     shift
 done
 
+if test "$DEBIAN_DIST_A" -o "$UBUNTU_DIST_A" -o "$CENTOS_DIST_A"; then
+    DEBIAN_DIST=$DEBIAN_DIST_A
+    UBUNTU_DIST=$UBUNTU_DIST_A
+    CENTOS_DIST=$CENTOS_DIST_A
+fi
+
 if test "$do_help" = "yes"; then
     usage 1 1>&2
 fi
@@ -164,9 +169,15 @@ if $upload; then
     for dist in ${CENTOS_DIST}; do
        arch=amd64
        prodver=${PRODUCT}-${VERSION}
-       if ssh $dist "cd rpmbuild/SOURCES/${prodver} && ../../../proj/git-tools/id-rpm-build/upload-rpms.sh ${PRODUCT}.spec"; then
+       if scp ${ID_DEB_BUILD}/../id-rpm-build/upload-rpms.sh ${dist}:rpmbuild/SOURCES/${prodver}/; then
            :
-           else
+       else
+           echo "Copy of upload-rpms.sh to $dist failed"
+           exit 1
+       fi
+       if ssh $dist "cd rpmbuild/SOURCES/${prodver} && chmod +x upload-rpms.sh && ./upload-rpms.sh ${PRODUCT}.spec"; then
+           :
+       else
            echo "Upload failed for $dist"
            exit 1
        fi
@@ -179,15 +190,9 @@ if $upload; then
     done
     echo ""
     echo "===================================================="
-    echo "Remember to update APT/YUM on ftp.indexdata.dk !!!"
-    echo ""
-    echo "ssh ftp.indexdata.dk"
-    echo "cd ~/proj/git-tools/update-archive"
-    echo "sudo su"
-    echo "./update-archive.sh"
-    if test "${CENTOS_DIST}"; then
-       echo "./update-yum-archive.sh"
-    fi
+    echo "APT/YUM should be updated via cron every 15 minutes "
+    echo " from July 11 2013 and later."
+    echo "No need to call update archive on kebab"
     echo "===================================================="
     exit 0
 fi
@@ -204,10 +209,10 @@ for dist in ${CENTOS_DIST}; do
        exit 1
     fi
 
-    if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS && test -x proj/git-tools/id-rpm-build/upload-rpms.sh"; then
+    if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS"; then
        :
     else
-       echo "Host $dist does not seem to be prepared with git-tools and rpmbuild directories"
+       echo "Host $dist does not seem to be prepared with rpmbuild directories"
        exit 1
     fi