[GRASS-SVN] r45258 - in grass/branches/releasebranch_6_4: gui/tcltk/d.m lib/vector/dglib/examples tools

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Jan 30 22:41:40 EST 2011


Author: hamish
Date: 2011-01-30 19:41:40 -0800 (Sun, 30 Jan 2011)
New Revision: 45258

Modified:
   grass/branches/releasebranch_6_4/gui/tcltk/d.m/d.m
   grass/branches/releasebranch_6_4/lib/vector/dglib/examples/rtest03.sh
   grass/branches/releasebranch_6_4/tools/g51.extract_description.sh
Log:
fix bashisms (merge from devbr6 r45002, r44999, r44998)

Modified: grass/branches/releasebranch_6_4/gui/tcltk/d.m/d.m
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/d.m/d.m	2011-01-30 17:15:29 UTC (rev 45257)
+++ grass/branches/releasebranch_6_4/gui/tcltk/d.m/d.m	2011-01-31 03:41:40 UTC (rev 45258)
@@ -9,6 +9,8 @@
 #% required : no
 #%End
 
+
+# fixme: $HOSTTYPE is a bashism
 if [ $# -eq 0 ] ; then
 	if [ "$HOSTTYPE" = "macintosh" -o "$HOSTTYPE" = "powermac" -o "$HOSTTYPE" = "powerpc" -o "$HOSTTYPE" = "intel-pc" ] ; then
 		exec "$GRASS_WISH" $GISBASE/etc/dm/d.m.tcl -name d_m_tcl

Modified: grass/branches/releasebranch_6_4/lib/vector/dglib/examples/rtest03.sh
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/dglib/examples/rtest03.sh	2011-01-30 17:15:29 UTC (rev 45257)
+++ grass/branches/releasebranch_6_4/lib/vector/dglib/examples/rtest03.sh	2011-01-31 03:41:40 UTC (rev 45258)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 
 rm -f X1 X2 X3 X1.txt X2.txt X3.txt

Modified: grass/branches/releasebranch_6_4/tools/g51.extract_description.sh
===================================================================
--- grass/branches/releasebranch_6_4/tools/g51.extract_description.sh	2011-01-30 17:15:29 UTC (rev 45257)
+++ grass/branches/releasebranch_6_4/tools/g51.extract_description.sh	2011-01-31 03:41:40 UTC (rev 45258)
@@ -16,7 +16,7 @@
 FILE=$PATHGRASS50/html/html/$2.html
 
 CUTLINE="`grep -ni '<H2>DESCRIPTION' $FILE | cut -d':' -f1`"
-if [ "$CUTLINE" == "" ] ; then
+if [ -z "$CUTLINE" ] ; then
   echo "ERROR: no <H2>DESCRIPTION</H2> present in html file"
   exit
 fi



More information about the grass-commit mailing list