[GRASS-SVN] r49504 - in grass/branches/develbranch_6: gui/scripts scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-03 03:14:37 -0800 (Sat, 03 Dec 2011)
New Revision: 49504

Modified:
   grass/branches/develbranch_6/gui/scripts/g.extension.py
   grass/branches/develbranch_6/scripts/g.extension/g.extension
Log:
g.extension: change default URL to `grass6`


Modified: grass/branches/develbranch_6/gui/scripts/g.extension.py
===================================================================
--- grass/branches/develbranch_6/gui/scripts/g.extension.py	2011-12-03 11:06:14 UTC (rev 49503)
+++ grass/branches/develbranch_6/gui/scripts/g.extension.py	2011-12-03 11:14:37 UTC (rev 49504)
@@ -45,7 +45,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

Modified: grass/branches/develbranch_6/scripts/g.extension/g.extension
===================================================================
--- grass/branches/develbranch_6/scripts/g.extension/g.extension	2011-12-03 11:06:14 UTC (rev 49503)
+++ grass/branches/develbranch_6/scripts/g.extension/g.extension	2011-12-03 11:14:37 UTC (rev 49504)
@@ -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
@@ -410,7 +410,7 @@
    if [ "$MYINST_DIR" = "$GRASS_ADDON_PATH1" ] || [ "$MYINST_DIR" = ~/.grass6/addons ] ; then
       # symlink into path which is actually in the $PATH
       if [ 1 -eq 1 ] ; then
-         ln -s "$MYINST_DIR/$PROGTYPE/$MODULE" "$MYINST_DIR/"
+         ln -sf "$MYINST_DIR/$PROGTYPE/$MODULE" "$MYINST_DIR/"
       else
           # TODO: move them out of bin/ and script/ into .., and rmdir bin/ and script/ if they are empty.
          mv "$MYINST_DIR/$PROGTYPE/$MODULE" "$MYINST_DIR/"