[GRASS-SVN] r43032 - in grass/branches/develbranch_6: gui/wxpython lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-09 20:05:25 +0000 (Mon, 09 Aug 2010)
New Revision: 43032

Removed:
   grass/branches/develbranch_6/gui/wxpython/wxgui
Modified:
   grass/branches/develbranch_6/lib/init/init.sh
Log:
remove wxgui bash script


Deleted: grass/branches/develbranch_6/gui/wxpython/wxgui
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui	2010-08-09 19:29:38 UTC (rev 43031)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui	2010-08-09 20:05:25 UTC (rev 43032)
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#% Module
-#%  description: wxPython-based GUI for GRASS GIS
-#%  keywords: general, gui
-#% End
-#%option
-#% key: workspace
-#% type: string
-#% description: Name of workspace file (.grc)
-#% required : no
-#%End
-
-if [ -z "$GISBASE" ] ; then
-    echo "You must be in GRASS GIS to run this program." 1>&2
-    exit 1
-fi
-
-if [ -z "$GRASS_PYTHON" ] ; then
-    g.message -e "GRASS_PYTHON environment variable not set"
-    exit 1
-fi
-
-if [ $# -eq 0 ] ; then
-    "$GRASS_PYTHON" "$GISBASE/etc/wxpython/wxgui.py" &
-    exit 0
-fi
-
-if [ "$1" != "@ARGS_PARSED@" ] ; then
-  exec g.parser "$0" "$@"
-fi
-
-if test -n "$GIS_OPT_WORKSPACE" ; then
-    # load workspace file
-    "$GRASS_PYTHON" "$GISBASE/etc/wxpython/wxgui.py" "--workspace" "$GIS_OPT_WORKSPACE" &
-else
-    "$GRASS_PYTHON" "$GISBASE/etc/wxpython/wxgui.py" &
-fi
-
-exit 0

Modified: grass/branches/develbranch_6/lib/init/init.sh
===================================================================
--- grass/branches/develbranch_6/lib/init/init.sh	2010-08-09 19:29:38 UTC (rev 43031)
+++ grass/branches/develbranch_6/lib/init/init.sh	2010-08-09 20:05:25 UTC (rev 43032)
@@ -14,7 +14,7 @@
 #   	    	command line options for setting the GISDBASE, LOCATION, and/or
 #   	    	MAPSET. Finally it starts GRASS with the appropriate user
 #   	    	interface and cleans up after it is finished.
-# COPYRIGHT:    (C) 2000 by the GRASS Development Team
+# COPYRIGHT:    (C) 2000, 2010 by the GRASS Development Team
 #
 #               This program is free software under the GNU General Public
 #   	    	License (>=v2). Read the file COPYING that comes with GRASS
@@ -826,7 +826,7 @@
 	"$GISBASE/scripts/d.m"
 	;;
     wxpython)
-        "$GISBASE/etc/wxpython/scripts/wxgui"
+        "$GRASS_PYTHON" "$GISBASE/etc/wxpython/wxgui.py" &
 	;;
 
     # Ignore others