From 56c4affe6b7223147de447eaf21eeef0610dd7f5 Mon Sep 17 00:00:00 2001
From: Patrick Simianer <pks@pks.rocks>
Date: Wed, 4 Sep 2019 07:56:33 +0200
Subject: zsh: simplify zlogin

---
 zsh/.zlogin | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/zsh/.zlogin b/zsh/.zlogin
index 478e144..c25f783 100644
--- a/zsh/.zlogin
+++ b/zsh/.zlogin
@@ -1,10 +1,15 @@
-if [[ $(uname) == "Linux" ]]; then
-  if [ ! -n "$SSH_CLIENT" ] || [ ! -n "$SSH_TTY" ]; then
-    if [[ -z $DISPLAY ]] && (( $EUID != 0 )) {
-      [[ ${TTY/tty} != $TTY ]] && (( ${TTY:8:1} <= 3 )) &&
-        startx 1>/tmp/xsession-errors 2>&1 &
-        vlock
-    }
+if [[ $(uname) == "Linux" ]]; then             # on linux
+  if [ -z $SSH_CLIENT ]; then                  # not via ssh
+    if [[ -z $DISPLAY ]]; then                 # not in X
+      if [[ $TTY == "/dev/tty1" ]]; then       # tty1
+        if [[ -z $(pidof X) ]]; then           # no X running
+          startx 1>/tmp/xsession-errors 2>&1 & # startx
+          if [[ -x $(which vlock) ]]; then     # if have vlock
+            vlock                              # run it
+          fi
+        fi
+      fi
+    fi
   fi
 fi
 
-- 
cgit v1.2.3