[GRASS-SVN] r49505 - in grass/branches/releasebranch_6_4: gui/scripts scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-03 03:20:45 -0800 (Sat, 03 Dec 2011)
New Revision: 49505

Modified:
   grass/branches/releasebranch_6_4/gui/scripts/g.extension.py
   grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
Log:
g.extension: change default URL to grass6
	     (merge r49504 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/scripts/g.extension.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/g.extension.py	2011-12-03 11:14:37 UTC (rev 49504)
+++ grass/branches/releasebranch_6_4/gui/scripts/g.extension.py	2011-12-03 11:20:45 UTC (rev 49505)
@@ -44,7 +44,7 @@
 #% key_desc: url
 #% description: SVN Addons repository URL
 #% required: yes
-#% answer: https://svn.osgeo.org/grass/grass-addons
+#% answer: http://svn.osgeo.org/grass/grass-addons/grass6
 #%end
 #%option
 #% key: prefix

Modified: grass/branches/releasebranch_6_4/scripts/g.extension/g.extension
===================================================================
--- grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2011-12-03 11:14:37 UTC (rev 49504)
+++ grass/branches/releasebranch_6_4/scripts/g.extension/g.extension	2011-12-03 11:20:45 UTC (rev 49505)
@@ -41,7 +41,7 @@
 #% key_desc: url
 #% description: SVN Addons repository URL
 #% required: yes
-#% answer: http://svn.osgeo.org/grass/grass-addons
+#% answer: http://svn.osgeo.org/grass/grass-addons/grass6
 #%end
 #%option
 #% key: prefix
@@ -405,7 +405,7 @@
 
    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/"
+      ln -sf "$MYINST_DIR/$PROGTYPE/$MODULE" "$MYINST_DIR/"
    fi
 fi