[GRASS-SVN] r49342 - grass/branches/releasebranch_6_4/scripts/g.extension

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Nov 24 01:54:20 EST 2011


Author: hamish
Date: 2011-11-23 22:54:20 -0800 (Wed, 23 Nov 2011)
New Revision: 49342

Modified:
   grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
Log:
create a dummy location so that the --html-description usage gets built into the help page, and quieting two (harmless) error messages (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
===================================================================
--- grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2011-11-24 06:52:26 UTC (rev 49341)
+++ grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2011-11-24 06:54:20 UTC (rev 49342)
@@ -305,6 +305,18 @@
    DIST_DIR="dist.unknown"
 fi
 
+# set up a demolocation so --html-description works
+GVER=`echo "$GRASS_VERSION" | cut -f1,2 -d'.' | sed -e 's/\.//'`
+mkdir -p "$TMPDIR/$DIST_DIR/demolocation/PERMANENT"
+cat << EOF > "$TMPDIR/$DIST_DIR/demolocation/.grassrc$GVER"
+GISDBASE: $TMPDIR/$DIST_DIR
+LOCATION_NAME: demolocation
+MAPSET: PERMANENT
+GRASS_DB_ENCODING: utf-8
+DEBUG: 0
+GRASS_GUI: text
+EOF
+
 # $INST_NOW helps compile and install modules directly into $(INST_DIR)
 # without having to install whole distribution even after modifying only
 # one module. It will update both $(GRASS_HOME)/dist.$(ARCH) and $(INST_DIR).
@@ -390,7 +402,7 @@
      exit 1
    fi
 
-   if [ "$MYINST_DIR" = "$GRASS_ADDON_PATH1" ] || [ "$MYINST_DIR" = ~/.grass6/addons  ] ; then
+   if [ "$MYINST_DIR" = "$GRASS_ADDON_PATH1" ] || [ "$MYINST_DIR" = ~/.grass6/addons ] ; then
       # symlink into path which is actually in the $PATH
       ln -s "$MYINST_DIR/$PROGTYPE/$MODULE" "$MYINST_DIR/"
    fi



More information about the grass-commit mailing list