[GRASS-SVN] r62721 - grass-addons/tools/addons

Thu Nov 13 03:10:08 PST 2014

Author: martinl
Date: 2014-11-13 03:10:08 -0800 (Thu, 13 Nov 2014)
New Revision: 62721

Modified:
   grass-addons/tools/addons/compile.sh
   grass-addons/tools/addons/grass-addons.sh
Log:
addons: ALL.html renamed to index.html

Modified: grass-addons/tools/addons/compile.sh
===================================================================

--- grass-addons/tools/addons/compile.sh	2014-11-13 10:50:41 UTC (rev 62720)
+++ grass-addons/tools/addons/compile.sh	2014-11-13 11:10:08 UTC (rev 62721)
@@ -10,7 +10,7 @@
 TOPDIR="$2"
 ADDON_PATH="$3"
 GRASS_VERSION=`echo $ADDON_PATH | cut -d'/' -f6 | sed 's/grass//g'`
-INDEX_FILE="ALL.html"
+INDEX_FILE="index"
 
 if [ ! -d "$3" ] ; then
     mkdir -p "$3"
@@ -30,7 +30,7 @@
 date=`date -I`
 uname=`uname`
 mkdir "$ADDON_PATH/logs"
-touch "$ADDON_PATH/logs/ALL.log"
+touch "$ADDON_PATH/logs/${INDEX_FILE}.log"
 echo "<!--<?xml-stylesheet href=\"style.css\" type=\"text/css\"?>-->
 <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
 	  \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
@@ -58,7 +58,7 @@
 <table cellpadding=\"5\">
 <tr><th style=\"background-color: grey\">AddOns</th>
 <th style=\"background-color: grey\">Status</th>
-<th style=\"background-color: grey\">Log file</th></tr>" > "$ADDON_PATH/logs/$INDEX_FILE"
+<th style=\"background-color: grey\">Log file</th></tr>" > "$ADDON_PATH/logs/${INDEX_FILE}.html"
 
 echo "-----------------------------------------------------"
 echo "AddOns '$ADDON_PATH'..."
@@ -78,7 +78,7 @@
 	    path="$ADDON_PATH"
 	fi
 
-	echo "<tr><td><tt>$c/$m</tt></td>" >> "$ADDON_PATH/logs/$INDEX_FILE"	
+	echo "<tr><td><tt>$c/$m</tt></td>" >> "$ADDON_PATH/logs/${INDEX_FILE}.html"
 	make MODULE_TOPDIR="$TOPDIR" clean > /dev/null 2>&1
 	make MODULE_TOPDIR="$TOPDIR" \
 	    BIN="$path/bin" \
@@ -87,15 +87,15 @@
 	    SCRIPTDIR="$path/scripts" \
 	    ETC="$path/etc" > "$ADDON_PATH/logs/$m.log" 2>&1
 	if [ `echo $?` -eq 0 ] ; then
-	    printf "%-30s%s\n" "$c/$m" "SUCCESS" >> "$ADDON_PATH/logs/ALL.log"
+	    printf "%-30s%s\n" "$c/$m" "SUCCESS" >> "$ADDON_PATH/logs/${INDEX_FILE}.log"
 	    echo " SUCCESS"
-	    echo "<td style=\"background-color: green\">SUCCESS</td>" >> "$ADDON_PATH/logs/$INDEX_FILE"
+	    echo "<td style=\"background-color: green\">SUCCESS</td>" >> "$ADDON_PATH/logs/${INDEX_FILE}.html"
 	else
-	    printf "%-30s%s\n" "$c/$m" "FAILED" >> "$ADDON_PATH/logs/ALL.log"
+	    printf "%-30s%s\n" "$c/$m" "FAILED" >> "$ADDON_PATH/logs/${INDEX_FILE}.log"
 	    echo " FAILED"
-	    echo "<td style=\"background-color: red\">FAILED</td>" >> "$ADDON_PATH/logs/$INDEX_FILE"
+	    echo "<td style=\"background-color: red\">FAILED</td>" >> "$ADDON_PATH/logs/${INDEX_FILE}.html"
 	fi
-	echo "<td><a href=\"$m.log\">log</a></td></tr>" >> "$ADDON_PATH/logs/$INDEX_FILE"
+	echo "<td><a href=\"$m.log\">log</a></td></tr>" >> "$ADDON_PATH/logs/${INDEX_FILE}.html"
 	cd ..
     done
     cd ..
@@ -103,6 +103,6 @@
 
 echo "</table><hr />
 <div style=\"text-align: right\">Valid: <a href=\"http://validator.w3.org/check/referer\">XHTML</a></div>
-</body></html>" >> "$ADDON_PATH/logs/$INDEX_FILE"
+</body></html>" >> "$ADDON_PATH/logs/${INDEX_FILE}.html"
 
 exit 0

Modified: grass-addons/tools/addons/grass-addons.sh
===================================================================
--- grass-addons/tools/addons/grass-addons.sh	2014-11-13 10:50:41 UTC (rev 62720)
+++ grass-addons/tools/addons/grass-addons.sh	2014-11-13 11:10:08 UTC (rev 62721)
@@ -28,7 +28,7 @@
     	cp modules.xml $XMLDIR/grass${version}
     	rsync -ag --delete logs $XMLDIR/grass${version}
     	cd $XMLDIR/grass${version}/logs
-    	ln -sf ALL.html index.html
+    	###ln -sf ALL.html index.html
     done
 
     update_manual 7 0

