[Blends-commit] [SCM] website branch, master, updated. 85bc1afc43f8e584cbe1d2afda03de146f7b7eda

[Andreas Tille]

The following commit has been merged in the master branch:
commit 85bc1afc43f8e584cbe1d2afda03de146f7b7eda
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jul 9 17:18:59 2014 +0200

    Make sure even if the Git repository is differently named than the data dir all will went smoothly

diff --git a/webtools/check-all-tasks b/webtools/check-all-tasks
index f4e9bc0..1778008 100755
--- a/webtools/check-all-tasks
+++ b/webtools/check-all-tasks
@@ -31,6 +31,7 @@ for bc in `ls webconf/*.conf | grep -v -e "webconf/fun\." -e rest-test` ; do
     blend=`basename ${bc} .conf`
     # echo "----- $blend ------"
     datadir=`grep "^DataDir:" ${bc} | sed 's/^DataDir:\s*//'`
+    datasubdir=`echo $datadir | sed 's?^.*/\([^/]\+\)$?\1?'`
     vcsurl=`grep "^VcsDir:" ${bc} | sed 's/^VcsDir:\s*//'`
     vcstype=`echo ${vcsurl} | sed 's/^\([a-z]\{3\}\):.*/\1/'`
     if [ "$vcstype" != "git" -a "$vcstype" != "svn" ] ; then
@@ -47,10 +48,10 @@ for bc in `ls webconf/*.conf | grep -v -e "webconf/fun\." -e rest-test` ; do
     if [ ! -d ${datadir} ] ; then
         if [ "${vcstype}" = "git" ] ; then
             cd `dirname ${datadir}`
-            git clone --quiet ${vcsurl} 2>/dev/null && true
+            git clone --quiet ${vcsurl} ${datasubdir} 2>/dev/null && true
             if [ $? -gt 0 ] ; then
                 # echo "Unable to fetch initial data for $blend from $VcsDir - try without SSL verification" ;
-                GIT_SSL_NO_VERIFY=1 git clone  --quiet ${vcsurl} >/dev/null && true
+                GIT_SSL_NO_VERIFY=1 git clone  --quiet ${vcsurl}  ${datasubdir} >/dev/null && true
             fi
         else if [ "${vcstype}" = "svn" ] ; then
                 mkdir -p ${datadir}
@@ -82,11 +83,13 @@ for bc in `ls webconf/*.conf | grep -v -e "webconf/fun\." -e rest-test` ; do
                 echo "Unknown VcsType ${vcstype} in VcsURL ${vcsurl}"
             fi
         fi
-        if [ ! -e ${md5file} ] ; then
+        if [ ! -e ${md5file} -a -d tasks ] ; then
     	    cat `find tasks -mindepth 1 -maxdepth 1 -type f | sort` | md5sum > ${md5file}
         else
             mv ${md5file} ${md5file}.old
-    	    cat `find tasks -mindepth 1 -maxdepth 1 -type f | sort` | md5sum > ${md5file}
+            if [ -d tasks ] ; then
+  	        cat `find tasks -mindepth 1 -maxdepth 1 -type f | sort` | md5sum > ${md5file}
+  	    fi
     	    if ! diff ${md5file} ${md5file}.old >/dev/null ; then
     		# echo "Difference in tasks files of Blend ${blend}"
     		cd $curdir

-- 
Static and dynamic websites for Debian Pure Blends