new layout

diff --git a/scripts/git-check.sh b/scripts/git-check.sh
index b87b3ea..67b2a42 100755 (executable)
--- a/scripts/git-check.sh
+++ b/scripts/git-check.sh
@@ -9,46 +9,13 @@ gitwebpattern=""
 for file in $gitwebfiles; do gitwebpattern="${gitwebpattern}|$file" ; done
 gitwebpattern=$(echo "$gitwebpattern" | sed -e 's,|,,')
 
-### function count () {
-### 
-###     echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx counting"
-### 
-###     echo git
-###     ls git | wc -l 
-### 
-###     echo gitweb
-###     ls gitweb | egrep -v "$gitwebpattern" | wc -l 
-### 
-### }
-### 
-### function missing_in_git () {
-### 
-###     echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx missing in git"
-### 
-###     for i in $(ls gitweb | egrep -v $gitwebpattern); do 
-###    b=$(basename $i .git)
-###    [ -d git/$b ] || echo $b missing in git
-###     done
-### 
-### }
+function missing_gitweb () {
 
-function missing_in_gitweb () {
-
-###     echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx missing in gitweb (from git)"
-### 
-###     for i in $(ls git); do 
-###    echo -n "$i " 
-###    if [ ! -h gitweb/${i}.git ] ; then
-###        echo -n "ADDING $i.git "
-###        (cd git; ln -s ../$i/.git ${i}.git)
-###    fi
-###     done
-    
     echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx missing in gitweb (for web)"
     for i in $gitwebfiles; do
        echo -n "$i "
-       if [ ! -h git/${i} ] ; then
-           echo "LINKING.. " ; (cd git; ln -s ../${i} .)
+       if [ ! -f ${i} ] ; then
+           echo "WARNING: IS MISSING.. " ; 
        fi
     done
     echo ""
@@ -58,10 +25,11 @@ function missing_in_gitweb () {
 function fill_descriptions () {
     echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx checking descriptions "
     for arg in "$@" ; do
-       # accept args like git/plcapi
-       i=$(basename $arg)
-       echo -n "$i "
-       grep Unnamed git/$i/.git/description && { echo -n $i "Setting.. "; echo $i > git/$i/.git/description ; }
+       # accept args like plcapi or plcapi.git
+       b=$(basename $arg .git)
+       giti=${b}.git
+       echo -n "$git "
+       grep Unnamed $git/description && { echo -n $i "Setting.. "; echo $b > $git/description ; }
     done
     echo ""
 }
@@ -69,12 +37,13 @@ function fill_descriptions () {
 function upload_archives () {
     echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx checking configs for uploadarch "
     for arg in "$@" ; do
-       # accept args like git/plcapi
-       i=$(basename $arg)
-       echo -n "$i "
-       if ! grep uploadarch git/$i/.git/config ; then
+       # accept args like plcapi or plcapi.git
+       b=$(basename $arg .git)
+       giti=${b}.git
+       echo -n "$git "
+       if ! grep uploadarch $git/config ; then
            echo -n $i "Setting.. "; 
-           cat >> git/$i/.git/config <<EOF
+           cat >> $git/config <<EOF
 [daemon]
        uploadpack = false
        uploadarch = true
@@ -84,8 +53,6 @@ EOF
     echo ""
 }
 
-#count
-#missing_in_git
-missing_in_gitweb
-fill_descriptions $(ls git | egrep -v "${gitwebpattern}")
-upload_archives $(ls git | egrep -v "${gitwebpattern}")
+missing_gitweb
+fill_descriptions $(ls *.git)
+upload_archives $(ls *.git)