[GRASS-SVN] r39365 - grass/branches/develbranch_6/lib/init

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-09-30 18:07:15 -0400 (Wed, 30 Sep 2009)
New Revision: 39365

Modified:
   grass/branches/develbranch_6/lib/init/grass.src
Log:
Revert r39326


Modified: grass/branches/develbranch_6/lib/init/grass.src
===================================================================
--- grass/branches/develbranch_6/lib/init/grass.src	2009-09-30 20:32:12 UTC (rev 39364)
+++ grass/branches/develbranch_6/lib/init/grass.src	2009-09-30 22:07:15 UTC (rev 39365)
@@ -22,38 +22,4 @@
 GISBASE="GISBASE_VALUE"
 export GISBASE
 
-GISRCRC="$HOME/.grassrc6"
-
-if [ -n "$GRASS_BATCH_JOB" ] ; then
-	exec "$GISBASE/etc/Init.sh" "$@"
-fi
-
-if test -t 0; then
-	# We are running from some terminal (i.e. xterm).
-	exec "$GISBASE/etc/Init.sh" "$@"
-else
-	# We are running headless...
-	if [ ! -f "$GISRCRC" ] ; then
-		# First time user...
-		( exec xdg-terminal -e $0 "$@" ) &>/dev/null
-		# If there is no xdg-terminal, then fall back to xterm
-		( exec xterm -e $0 "$@" ) &>/dev/null
-	else
-		# Returning user may have preffered GRASS terminal application
-		if [ -z "$GRASS_XTERM" ]; then
-			GRASS_XTERM=`awk '/GRASS_XTERM/ {print $2}' "$GISRCRC"  2>/dev/null`
-		fi;
-		if [ -n "$GRASS_XTERM" ]; then
-			# User has preffered GRASS terminal app
-			( exec $GRASS_XTERM -e $0 "$@" ) &>/dev/null
-		else
-			# Starting user's preffered terminal app
-			( exec xdg-terminal -e $0 "$@" ) &>/dev/null
-			# If there is no xdg-terminal, then fall back to xterm
-			( exec xterm -e $0 "$@" ) &>/dev/null
-		fi;
-	fi;
-fi;
-
-exit 1; # If we got so far, it's an error.
-
+exec "$GISBASE/etc/Init.sh" "$@"