[Debian-astro-commits] [iraf] 01/01: Don't set terminal type in login.cl

[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 47dbedbbb61c6ac50c568f70e5528a61e214a6fa
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Nov 30 15:15:49 2017 +0100

    Don't set terminal type in login.cl
---
 .../Make-the-installation-FHS-conform.patch        | 24 +++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 28f4bdb..d3744bb 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -11,10 +11,10 @@ the system dependent files (binaries) in /usr/lib/iraf.
  pkg/ecl/exec.c         |  2 +-
  pkg/ecl/main.c         | 12 ++++++++++-
  test/files.md          | 56 +++++++++++++++++++++++++-------------------------
- unix/hlib/login.cl     | 30 +++++++++++++++------------
+ unix/hlib/login.cl     | 19 +++++++----------
  unix/hlib/zzsetenv.def |  3 ++-
  unix/os/irafpath.c     | 10 +++++++++
- 9 files changed, 83 insertions(+), 48 deletions(-)
+ 9 files changed, 73 insertions(+), 47 deletions(-)
 
 diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
 index c38a4be..d51ff4c 100644
@@ -177,10 +177,10 @@ index 1684d2e..f703377 100644
  
  ## NOAO packages
 diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 6d8c4c5..e91682a 100644
+index 6d8c4c5..4677fa4 100644
 --- a/unix/hlib/login.cl
 +++ b/unix/hlib/login.cl
-@@ -4,19 +4,23 @@
+@@ -4,19 +4,14 @@
  if (defpar ("logver"))
      logver = envget("version")
  
@@ -199,24 +199,14 @@ index 6d8c4c5..e91682a 100644
 -if (access (".hushiraf") == no)
 -    print "setting terminal type to 'U_TERM' ..."
 -stty U_TERM
--
 +set	userid		= envget("USER")
-+
+ 
 +# Set the terminal type.
-+if (envget("TERM") == "xgterm") {
-+    if (access (".hushiraf") == no)
-+        print "setting terminal type to 'xgterm' ..."
-+    stty xgterm
-+} else {
-+    if (access (".hushiraf") == no)
-+        print "setting terminal type to 'xtermjh' ..."
-+    print ("!!stty size") | cl() | scan(i,j)
-+    stty xtermjh nlines=(i) ncols=(j)
-+}
++#stty	xgterm		# xgterm, xtermjh, xterm
  
  #============================================================================
  # Uncomment and edit to change the defaults.
-@@ -148,7 +152,7 @@ else {
+@@ -148,7 +143,7 @@ else {
  # Notify the user if we're using the global login.
  path (".") | scan (s1)
  if ( osfn("home$") != substr (s1, strldx("!",s1)+1, strlen(s1)) ) {

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