[cig-commits] [commit] master: change the -E option of grdmap.sh from -E out.ps to -O out.ps for better compatibility with grdview.sh (32a6f1e)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/relax

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/305b7fcf5a6bde8237cb1bb9751fee2b3ccec152...92930c5c0126ed4d645181cb1fec84e5c2b5cf9d

>---------------------------------------------------------------

commit 32a6f1e41418bb250841be117e5b981c0a11ea2f
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Thu Jun 19 15:52:03 2014 -0700

    change the -E option of grdmap.sh from -E out.ps to -O out.ps for better compatibility with grdview.sh


>---------------------------------------------------------------

32a6f1e41418bb250841be117e5b981c0a11ea2f
 util/grdmap.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/util/grdmap.sh b/util/grdmap.sh
index 95a3d68..3e3b121 100755
--- a/util/grdmap.sh
+++ b/util/grdmap.sh
@@ -36,7 +36,7 @@ usage(){
 	echo "         -T title header"
 	echo "         -x do not display map (only create .ps file)"
 	echo "         -C interval plots contours every interval distance"
-	echo "         -E file.ps only plot base map with extra scripts"
+	echo "         -O file.ps only plot base map with extra scripts"
 	echo "         -J overwrites the geographic projections (for -J o the -b option is relative)"
         echo "         -Y shift the plot vertically on the page"
 	echo ""
@@ -140,7 +140,7 @@ gmtset PAPER_MEDIA archA
 libdir=$(dirname $0)/../share
 EXTRA=""
 
-while getopts "b:c:e:ghi:o:p:v:s:t:T:u:xrC:E:J:Y:" flag
+while getopts "b:c:e:ghi:o:p:v:s:t:T:u:xrC:O:J:Y:" flag
 do
 	case "$flag" in
 	b) bset=1;bds=$OPTARG;;
@@ -159,12 +159,12 @@ do
 	v) vset=1;SIZE=$OPTARG;VECTOR=$OPTARG"c";;
 	x) xset=1;;
 	C) Cset="-C";contour=$OPTARG;;
-	E) Eset=1;PSFILE=$(dirname $OPTARG)/$(basename $OPTARG .ps).ps;;
+	O) Oset=1;PSFILE=$(dirname $OPTARG)/$(basename $OPTARG .ps).ps;;
 	J) Jset=1;PROJ=$OPTARG;;
 	Y) Yset=1;Yshift=$OPTARG;;
 	esac
 done
-for item in $bset $cset $iset $oset $pset $vset $sset $tset $Tset $uset $Yset $Cset $Eset $Jset $EXTRA;do
+for item in $bset $cset $iset $oset $pset $vset $sset $tset $Tset $uset $Yset $Cset $Oset $Jset $EXTRA;do
 	shift;shift
 done
 for item in $gset $hset $xset $rset;do
@@ -199,7 +199,7 @@ else
 fi
 
 # usage
-if [ $# -lt "1" -a "$Eset" != "1" ] || [ "$hset" == "1" ] ; then
+if [ $# -lt "1" -a "$Oset" != "1" ] || [ "$hset" == "1" ] ; then
 	usage
 else
 	echo $self: using colorfile $cptfile
@@ -207,7 +207,7 @@ fi
 
 
 # loop over grd files
-while [ "$#" != "0" -o "$Eset" == "1" ];do
+while [ "$#" != "0" -o "$Oset" == "1" ];do
 
 	if [ "$1" != "" ]; then
 		WDIR=`dirname $1`
@@ -375,5 +375,5 @@ while [ "$#" != "0" -o "$Eset" == "1" ];do
 	fi
 
 	# prevent more empty plots (cancel -E option)
-	Eset=""
+	Oset=""
 done