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

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-05-13 02:35:51 -0700 (Fri, 13 May 2011)
New Revision: 46258

Modified:
   grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
Log:
if GRASS_ADDON_PATH contains multiple entries, just take the first one (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-05-13 09:34:43 UTC (rev 46257)
+++ grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2011-05-13 09:35:51 UTC (rev 46258)
@@ -213,9 +213,11 @@
 	## will GRASS_ADDON_ETC help for man/ and docs/ ?
 	## maybe have g.manual search in GRASS_ADDON_ETC/../ ?  :-/
 	mkdir -p ~/.grass6/addons
-	GRASS_ADDON_PATH=~/.grass6/addons
+	GRASS_ADDON_PATH1=~/.grass6/addons
+    else
+	GRASS_ADDON_PATH1=`echo "$GRASS_ADDON_PATH" | cut -f1 -d:`
     fi
-    PREFIX="$GRASS_ADDON_PATH"
+    PREFIX="$GRASS_ADDON_PATH1"
 elif [ "$PREFIX" = '$GISBASE' ] || [ $GIS_FLAG_S -eq 1 ] ; then
    SYSADMIN=1
    PREFIX="$GISBASE"
@@ -325,7 +327,7 @@
      exit 1
    fi
 
-   if [ "$MYINST_DIR" = "$GRASS_ADDON_PATH" ] ; then
+   if [ "$MYINST_DIR" = "$GRASS_ADDON_PATH1" ] ; then
       # symlink into path which is actually in the $PATH
       ln -s "$MYINST_DIR/$PROGTYPE/$MODULE" "$MYINST_DIR/"
    fi