Changeset 2307

Timestamp:

10/23/07 14:10:51 (6 years ago)

Author:

alanbach-guest

Message:

watch system improvements

Location:

scripts

Files:

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

scripts/watch.php

@@ -4 +4 @@
 // Based on Debian DEHS http://svn.debian.org/wsvn/dehs
 //
-// Updated: 2007-10-23 09:25 +330 GMT
+// Updated: 2007-10-23 13:11 +330 GMT
 
 $vars=$_GET["vars"];
 uscan($vars);
+
+$svn_url="http://svn.debian.org/svn/pkg-parsix/pkg";
 
 // Display warnings?
@@ -18 +20 @@
         $arrarchs=explode("-", $arrvars[1]);
 
-        $spkg = $arrvars[2];       
+        $spkg = $arrvars[2];
+        $parsix_ver = $arrvars[3];
+
+        $parsix_rev = $arrvars[4];
+        $component = $arrvars[5];
+
+        if(!empty($parsix_rev)){
+              $parsix_rev = "-".$parsix_rev;
+        }
 
         if(!empty($arrarchs[0])){
@@ -86 +96 @@
                         break;                  
         }       
-        
+
         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 align=center>".$archs."</td><td bgcolor=".$bk_color.">".$status."</td>";
+                        echo "<tr bgcolor=white><td><b>".$pkg."</b></td><td><a href=".$up_url.">".$upstream."</a></td><td><font color=".$color.">".$parsix.$parsix_rev."</font></td><td align=center>".$archs."</td><td bgcolor=".$bk_color.">".$status."</td>";
                 }else{
+                        if(strstr($spkg, 'parsix') != null){
+                             $upstream = "<a href=".$svn_url."/".$component."/".$spkg."/trunk/>Parsix Native</a>";
+                        }else{
+                             $upstream = "N/A"
+                        }
+
                         if($show_warnings){
                                 echo "<tr bgcolor=white><td><b>".$pkg."</b></td><td colspan=4 bgcolor=#ff9966>".$warnings."</td><td>";
                         }else{
-                                echo "<tr bgcolor=white><td><b>".$pkg."</b></td><td>N/A</td><td><font color=".$color.">".$parsix."</font></td><td align=center>".$archs."</td><td bgcolor=".$bk_color.">".$status."</td>";
+                                echo "<tr bgcolor=white><td><b>".$spkg."</b></td><td>".$upstream."</td><td><font color=".$color.">".$parsix_ver.$parsix_rev."</font></td><td align=center>".$archs."</td><td bgcolor=".$bk_color.">".$status."</td>";
                         }
                 }

scripts/watch.sh

@@ -3 +3 @@
 # Coyright 2007 Alan Baghumian / GNU/GPL
 #
-# Updated: 2007-10-23 09:25 +330 GMT
+# Updated: 2007-10-23 12:29 +330 GMT
 #
-# Requires: lynx, devscripts
+# Requires: lynx, devscripts, tail, awk, sed
 
 BASE_PATH="/home/parsix/public_html/watch"
@@ -32 +32 @@
 
 # ARCH Checks
-PKG=`basename ${x/%trunk\/debian\/watch/}`
+#PKG=`basename ${x/%trunk\/debian\/watch/}`
+PKG=`basename ${x/%trunk\/debian/}`
 LORPATH=`find $LOCAL_REPO -type d | grep $PKG`
 cd $SVN_REPO/pkg/
@@ -71 +72 @@
 
 if [ ! -z "$FAKEARCHS" ]; then
-lynx -source $BASE_URL/watch.php?vars=${x/%debian\/watch/}*$ARCHS*$PKG | sed s/Debian/Parsix/g >> $BASE_PATH/index.html
+#lynx -source $BASE_URL/watch.php?vars=${x/%debian\/watch/}*$ARCHS*$PKG | sed s/Debian/Parsix/g >> $BASE_PATH/index.html
+lynx -source $BASE_URL/watch.php?vars=${x/%debian/}*$ARCHS*$PKG*$PKG_VERSION*$PKG_REVISION*$COMPONENT | sed s/Debian/Parsix/g >> $BASE_PATH/index.html
 fi