From c6aa7f2ded703228ba8217347846c6a4d80322d0 Mon Sep 17 00:00:00 2001 From: Gardouille Date: Tue, 21 Sep 2021 22:01:31 +0200 Subject: [PATCH] Fix indent --- zlogin | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/zlogin b/zlogin index 8d3c86e..92e8e7f 100644 --- a/zlogin +++ b/zlogin @@ -42,31 +42,37 @@ fi # List tmux sessions if tmux is available if [ $(command -v tmux) ]; then - TMUX_SESSION=$(tmux ls 2> /dev/null|grep -- window) - # If tmux session available and if not already inside a tmux - if [ ${TMUX_SESSION} ] && [ -z "${TMUX}" ]; then - printf '%b' "${MAGENTA}++++++++++++++++++++++++ ${WHITEB}Tmux session${RESET} ${MAGENTA}:++++++++++++++++++++++++${RESET}\n" - tmux ls - fi + TMUX_SESSION=$(tmux ls 2> /dev/null|grep -- window) + # If tmux session available and if not already inside a tmux + if [ ${TMUX_SESSION} ] && [ -z "${TMUX}" ]; then + printf '%b' "${MAGENTA}++++++++++++++++++++++++ ${WHITEB}Tmux session${RESET} ${MAGENTA}:++++++++++++++++++++++++${RESET}\n" + tmux ls + fi fi +# ssh-agent with fix socket path +## See load-ssh-agent function in ~/.zsh/zshrc +load-ssh-agent + # Recupere un caractere unique getc () { - stty raw -echo - tmp=`dd bs=1 count=1 2>/dev/null` - eval $1='$tmp' - stty cooked + stty raw -echo + tmp=`dd bs=1 count=1 2>/dev/null` + eval $1='$tmp' + stty cooked } ## Autorun an X session with some restrictions ## Set a ~/.noxorg file to work in tty only # If non-root session if [ ${USER} != "root" ] && [ $(command -v startx) ]; then - # If it's a VC console and - # no X session already launch and - # no ~/.noxorg file exist - if [ -z "${SSH_TTY}" ] && [ -z "$(pidof /usr/lib/xorg/Xorg)" ] && [ ! -f ~/.noxorg ];then + # If it's a VC console and + # no X session already launch and + # no ~/.noxorg file exist + if [ -z "${SSH_TTY}" ] && + [ ! -f "${HOME}/.noxorg" ] && + ! pidof "/usr/lib/xorg/Xorg" ; then echo "Aucune session X11 détectée, voulez vous en lancer une ? [O|n]" getc start_x if [ `echo "$start_x" | grep "n"` ];then @@ -76,7 +82,3 @@ if [ ${USER} != "root" ] && [ $(command -v startx) ]; then fi fi fi - -# ssh-agent with fix socket path -## See load-ssh-agent function in ~/.zsh/zshrc -load-ssh-agent