zlogout: clean up logic, dont act without data

previously termcap/terminfo was checked even if the arrays were not set. now,
they are checked before doing anything. logic was also simplified.

diff --git a/etc/zsh/.zlogout b/etc/zsh/.zlogout
index 8ab31d138c2edad82ff9c6578d58bd722a844e57..df25b19ea3bf1783adb96e45e5ef0d28d09e4d86 100644 (file)
--- a/etc/zsh/.zlogout
+++ b/etc/zsh/.zlogout
@@ -20,20 +20,22 @@ if [[ -o interactive ]] {
     #  - often they are just wrappers for ncurses tput or other tools
     #  - they may not even exist on lightweight systems
     #  - provided scripts/binaries may be buggy or broken
     #  - often they are just wrappers for ncurses tput or other tools
     #  - they may not even exist on lightweight systems
     #  - provided scripts/binaries may be buggy or broken

-    y=0
-    for x (rs1 rs2 rs3) {
-        [[ -v terminfo[$x] ]] || continue
-        echoti $x
-        y=1
+    y=1
+    if [[ -v terminfo ]] {
+        for x (rs1 rs2 rs3) {
+            [[ -v terminfo[$x] ]] || continue
+            echoti $x
+            y=0
+        }

     }
     }

-    if (( y == 0 )) {
+    if { (( y )) && -v termcap ]] } {

         for x (rs r1 r2 r3) {
             [[ -v termcap[$x] ]] || continue
             echotc $x
         for x (rs r1 r2 r3) {
             [[ -v termcap[$x] ]] || continue
             echotc $x

-            y=1
+            y=0

         }
     }
         }
     }

-    if (( y == 0 )) {
+    if (( y )) {

         # fallback, send ECMA-48 clear
         echo -en '\e[2J'
     }
         # fallback, send ECMA-48 clear
         echo -en '\e[2J'
     }