Changeset 1552 for scripts

Timestamp:

06/29/07 18:27:53 (6 years ago)

Author:

alanbach-guest

Message:

many fixes for the watch system

Location:

scripts

Files:

• watch.php (modified) (2 diffs)
• watch.sh (modified) (2 diffs)

scripts/watch.php

@@ -4 +4 @@
 // Based on Debian DEHS http://svn.debian.org/wsvn/dehs
 
-$path=$_GET["path"];
-$archs=$_GET["archs"];
-uscan($path);
+$vars=$_GET["vars"];
+uscan($vars);
 
 // Display warnings?
 $show_warnings=false;
 
-function uscan($path){
+function uscan($vars){
+        $arrvars=explode("*", $vars);
+        $path = $arrvars[0];
+
+        $arrarchs=explode("-", $arrvars[1]);
+        $archs="<font color=red>".$arrarchs[0]."</font>&nbsp;&nbsp;<font color=green>".$arrarchs[1]."</font>&nbsp;&nbsp;<font color=blue>".$arrarchs[2]."</font>";
+
         $uscan_res=shell_exec("/usr/bin/uscan --report --dehs --check-dirname-level 0 ".$path);
+
+        # work around the plus bug
+        $uscan_res=str_replace("+", "*", $uscan_res); 
         $p = xml_parser_create();
         xml_parse_into_struct($p, $uscan_res, $vals, $index);
@@ -49 +57 @@
         if($pkg !='' || $pkg !=null){
                 if($upstream != null){
-                        echo "<tr bgcolor=white><td><b>".$pkg."</b></td><td><a href=".$up_url.">".$upstream."</a></td><td><font color=".$color.">".$parsix."</font></td><td>".$archs."</td><td bgcolor=".$bk_color.">".$status."</td></tr>";
+                        echo "<tr bgcolor=white><td><b>".$pkg."</b></td><td><a href=".$up_url.">".$upstream."</a></td><td><font color=".$color.">".$parsix."</font></td><td align=center>".$archs."</td><td bgcolor=".$bk_color.">".$status."</td></tr>";
                 }else{
                         if($show_warnings){

scripts/watch.sh

@@ -7 +7 @@
 BASE_PATH="/home/parsix/public_html/watch"
 BASE_URL="http://watch.parsix.org"
+LOCAL_REPO="/home/parsix-pkg-repo"
+SVN_REPO="/svn/pkg-parsix/"
 
 if [ -f $BASE_PATH/index.html ]; then
@@ -18 +20 @@
 echo $HEADER > $BASE_PATH/index.html
 
-LIST=`find /svn/svn-parsix/ -name watch | grep debian | grep trunk | sort`
+LIST=`/usr/bin/find $SVN_REPO -name watch | /bin/grep debian | /bin/grep trunk | sort`
 
 for x in $LIST
+do
 # ARCH Checks
-$COUNT = `find ${x/%debian\/watch/} | grep -c amd64.deb`
+
+PKG=`basename ${x/%trunk\/debian\/watch/}`
+
+COUNT=`/usr/bin/find $LOCAL_REPO | /bin/grep $PKG | /bin/grep -c amd64.deb`
 if [ $COUNT -ne 0 ]; then
-        $AMD64 = "amd64"
+        AMD64="amd64"
+else
+        AMD64=""
 fi
 
-$COUNT = `find ${x/%debian\/watch/} | grep -c i386.deb`
+COUNT=`find $LOCAL_REPO | /bin/grep $PKG | /bin/grep -c i386.deb`
 if [ $COUNT -ne 0 ]; then
-        $I386 = "i386"
+        I386="i386"
+else
+        I386=""
 fi
 
-$COUNT = `find ${x/%debian\/watch/} | grep -c all.deb`
+COUNT=`find $LOCAL_REPO | /bin/grep $PKG | /bin/grep -c all.deb`
 if [ $COUNT -ne 0 ]; then
-        $ALLARCH = "all"
+        ALLARCH="all"
+else
+        ALLARCH=""
 fi
 
-ARCHS="$ALLARCH $I386 $AMD64"
+ARCHS="$ALLARCH-$I386-$AMD64"
 
-do lynx -source $BASE_URL/watch.php?path=${x/%debian\/watch/}&archs=$ARCHS | sed s/Debian/Parsix/g >> $BASE_PATH/index.html
+lynx -source $BASE_URL/watch.php?vars=${x/%debian\/watch/}*$ARCHS | sed s/Debian/Parsix/g >> $BASE_PATH/index.html
 
 done