[Debian-astro-commits] [iraf] 01/01: Set terminal size on start

[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 ae566425f4ffc3ae37d6973e0887db9b76ff88f1
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Nov 29 14:26:56 2017 +0100

    Set terminal size on start
---
 .../Make-the-installation-FHS-conform.patch        | 33 +++++++++++++---------
 .../patches/Separate-NOAO-and-dev-packages.patch   |  4 +--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 0316cfc..3e9e37c 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          | 112 ++++++++++++++++++++++++-------------------------
- unix/hlib/login.cl     |  23 +++++-----
+ unix/hlib/login.cl     |  30 +++++++------
  unix/hlib/zzsetenv.def |   3 +-
  unix/os/irafpath.c     |  10 +++++
- 9 files changed, 106 insertions(+), 74 deletions(-)
+ 9 files changed, 111 insertions(+), 76 deletions(-)
 
 diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
 index c38a4be..d51ff4c 100644
@@ -239,10 +239,10 @@ index 17293ef..240b97b 100644
 +noaobin$libsmw.a
  ```
 diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index b72126e..3417757 100644
+index b72126e..3d14219 100644
 --- a/unix/hlib/login.cl
 +++ b/unix/hlib/login.cl
-@@ -4,19 +4,20 @@
+@@ -4,19 +4,23 @@
  if (defpar ("logver"))
      logver = envget("version")
  
@@ -254,26 +254,31 @@ index b72126e..3417757 100644
 +set	cache		= "home$cache/"
  set	uparm		= "home$uparm/"
 -set	userid		= "U_USER"
-+set	userid		= envget("USER")
- 
+-
 -# Set the terminal type.  We assume the user has defined this correctly 
 -# when issuing the MKIRAF and no longer key off the unix TERM to set a
 -# default.
-+# Set the terminal type.
- if (access (".hushiraf") == no)
+-if (access (".hushiraf") == no)
 -    print "setting terminal type to 'U_TERM' ..."
 -stty U_TERM
 -
-+    print "setting terminal type to '" envget("TERM") "' ..."
-+;
-+if (envget("TERM") == "xgterm") 
++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
-+    stty xterm
++} else {
++    if (access (".hushiraf") == no)
++        print "setting terminal type to 'xtermjh' ..."
++    print ("!!stty size") | cl() | scan(i,j)
++    stty xtermjh nlines=(i) ncols=(j)
++}
  
  #============================================================================
  # Uncomment and edit to change the defaults.
-@@ -144,7 +145,7 @@ else {
+@@ -144,7 +148,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)) ) {
diff --git a/debian/patches/Separate-NOAO-and-dev-packages.patch b/debian/patches/Separate-NOAO-and-dev-packages.patch
index 3da946e..bc94f5d 100644
--- a/debian/patches/Separate-NOAO-and-dev-packages.patch
+++ b/debian/patches/Separate-NOAO-and-dev-packages.patch
@@ -100,10 +100,10 @@ index 4e8b3a6..40b80e7 100644
  list = dpkg
  while (fscan (list, s1) != EOF) {
 diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 3417757..39571b9 100644
+index 3d14219..2c7ba1a 100644
 --- a/unix/hlib/login.cl
 +++ b/unix/hlib/login.cl
-@@ -124,9 +124,12 @@ if (deftask ("proto"))
+@@ -127,9 +127,12 @@ if (deftask ("proto"))
  
  tv              # image display
  utilities       # miscellaneous utilities

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