[Debian-astro-commits] [iraf] 03/04: fix xterm startup

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository iraf.

commit fc162b1ce436ec15f65b5e311aab55658b53c74e
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Dec 8 10:50:42 2017 +0100

    fix xterm startup
---
 debian/irafcl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/irafcl b/debian/irafcl
index baf655a..259e8db 100755
--- a/debian/irafcl
+++ b/debian/irafcl
@@ -22,13 +22,16 @@ export hbin="${host}bin"
 export F77="$hlib/f77.sh"
 export F2C="$hbin/f2c.e"
 
+iraf_version=$(grep version\\s  ${iraf}unix/hlib/zzsetenv.def | \
+		   cut -d\" -f2 | cut -d\  -f-3)
+
 while getopts "h?vcexf:" opt; do
     case "$opt" in
     h|\?)
 	echo 'IRAF Command Language Interpreter'
 	echo ''
 	echo 'Usage:'
-	echo '    irafcl [-v|-e|-c] [-f file]'
+	echo '    irafcl [-v|-e|-c] [-x] [-f file]'
 	echo ''
 	echo 'Arguments:'
 	echo '    -v        print version and exit'
@@ -39,7 +42,7 @@ while getopts "h?vcexf:" opt; do
 	echo ''
         ;;
     v)
-        grep version\\s  ${iraf}unix/hlib/zzsetenv.def |cut -d\" -f2
+        echo "${iraf_version}"
 	exit 0
         ;;
     e)
@@ -81,7 +84,7 @@ PATH=${irafbin}bin:${PATH}
 if [ "${start_x}" = "yes" ] ; then
     if which xgterm > /dev/null ; then
         cl_binary="xgterm -e ${cl_binary}"
-    elif which xgterm > /dev/null ; then
+    elif which xterm > /dev/null ; then
         cl_binary="xterm -e ${cl_binary}"
     fi
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git