Changeset 1849

Timestamp:

08/01/07 08:48:03 (6 years ago)

Author:

alanbach-guest

Message:

Minor fix in watch.sh

Location:

scripts

Files:

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

scripts/watch.php

@@ -15 +15 @@
 
         $arrarchs=explode("-", $arrvars[1]);
+
+        $spkg = $arrvars[2];
 
         if(!empty($arrarchs[0])){
@@ -41 +43 @@
 
         $pkg=$vals[$index['PACKAGE'][0]][value];
-        $pkg=str_replace("KKK", "+", $pkg); 
+    
+        if(!empty($pkg)){
+                $pkg=str_replace("KKK", "+", $pkg); 
+        }else{
+                $pkg = $spkg;
+        }
 
         $upstream=$vals[$index['UPSTREAM-VERSION'][0]][value];
@@ -63 +70 @@
         switch($status)
         {
-                case "up to date":
+                case "Up to date":
                         $bk_color="#00ff00";
                         break;
@@ -72 +79 @@
                         $bk_color="#ffcc99";
                         break;
+                default:
+                        $status = "Watch file does not find"
+                        $bk_color="#ffea99";
+                        break;                  
         }       
         

scripts/watch.sh

@@ -20 +20 @@
 echo $HEADER > $BASE_PATH/index.html
 
-LIST=`/usr/bin/find $SVN_REPO -name watch | /bin/grep debian | /bin/grep trunk | sort`
+LIST=`/usr/bin/find $SVN_REPO -name watch | /bin/grep debian | /bin/grep trunk | sort -u`
 
 for x in $LIST
@@ -50 +50 @@
 
 ARCHS="$ALLARCH-$I386-$AMD64"
+FAKEARCHS="$ALLARCH$I386$AMD64"
 
 # work around the plus bug
 x=`echo $x | /usr/bin/awk '{ gsub(/+/, "KKK"); print }'`
 
-/usr/bin/lynx -source $BASE_URL/watch.php?vars=${x/%debian\/watch/}*$ARCHS | /bin/sed s/Debian/Parsix/g >> $BASE_PATH/index.html
+if [ ! -z "$FAKEARCHS" ]; then
+/usr/bin/lynx -source $BASE_URL/watch.php?vars=${x/%debian\/watch/}*$ARCHS*$PKG | /bin/sed s/Debian/Parsix/g >> $BASE_PATH/index.html
+fi
 
 done