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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-02-11 23:21:05 -0800 (Wed, 11 Feb 2015)
New Revision: 64580

Modified:
   grass-addons/tools/addons/compile.sh
   grass-addons/tools/addons/grass-addons-public.sh
   grass-addons/tools/addons/grass-addons.sh
Log:
addons build script: fix MANDIR + update build_addons()

Modified: grass-addons/tools/addons/compile.sh
===================================================================
--- grass-addons/tools/addons/compile.sh	2015-02-12 06:48:15 UTC (rev 64579)
+++ grass-addons/tools/addons/compile.sh	2015-02-12 07:21:05 UTC (rev 64580)
@@ -83,7 +83,7 @@
 	make MODULE_TOPDIR="$TOPDIR" \
 	    BIN="$path/bin" \
 	    HTMLDIR="$path/docs/html" \
-	    MANDIR="$path/man/man1" \
+	    MANDIR="$path/docs/man/man1" \
 	    SCRIPTDIR="$path/scripts" \
 	    ETC="$path/etc" > "$ADDON_PATH/logs/$m.log" 2>&1
 	if [ `echo $?` -eq 0 ] ; then

Modified: grass-addons/tools/addons/grass-addons-public.sh
===================================================================
--- grass-addons/tools/addons/grass-addons-public.sh	2015-02-12 06:48:15 UTC (rev 64579)
+++ grass-addons/tools/addons/grass-addons-public.sh	2015-02-12 07:21:05 UTC (rev 64580)
@@ -15,6 +15,10 @@
 
 ${SRC}/grass-addons/tools/addons/grass-addons.sh
 
+if [ $? != 0 ] ; then
+    exit 0
+fi
+
 manuals() {
     HTMLDIR=addons
     mkdir $HTMLDIR

Modified: grass-addons/tools/addons/grass-addons.sh
===================================================================
--- grass-addons/tools/addons/grass-addons.sh	2015-02-12 06:48:15 UTC (rev 64579)
+++ grass-addons/tools/addons/grass-addons.sh	2015-02-12 07:21:05 UTC (rev 64580)
@@ -11,10 +11,6 @@
 fi
 
 build_addons() {
-cd $DIR/grass-addons/ 
-
-nup=`(svn up || (svn cleanup && svn up)) | wc -l`
-if [ "$nup" -gt 1 ] || [ "$1" = "f" ] ; then
     cd tools/addons/ 
     ./compile-xml.sh $XMLDIR
     for version in 6 7 ; do
@@ -22,12 +18,10 @@
     	cp modules.xml $XMLDIR/grass${version}
     	rsync -ag --delete logs $XMLDIR/grass${version}
     	cd $XMLDIR/grass${version}/logs
-    	###ln -sf ALL.html index.html
     done
 
     update_manual 7 0
     update_manual 6 4
-fi
 }
 
 recompile_grass() {
@@ -78,6 +72,12 @@
     recompile_grass
 fi
 
-build_addons $1
+cd $DIR/grass-addons/ 
 
-exit 0
+nup=`(svn up || (svn cleanup && svn up)) | wc -l`
+if [ "$nup" -gt 1 ] || [ "$1" = "f" ] ; then
+    build_addons $1
+    exit 0
+fi
+
+exit 1