From cabd13b69566002210c0b2988af849520c4a6d21 Mon Sep 17 00:00:00 2001 From: GrĂ©goire DuchĂȘne Date: Sun, 24 May 2020 23:29:15 +0100 Subject: zsh: Use :l when defining DOMAIN, HOST, and UNAME --- zsh/env | 11 ++++++----- zsh/login | 6 +++--- zsh/rc | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/zsh/env b/zsh/env index 5090142..b2bd2c9 100644 --- a/zsh/env +++ b/zsh/env @@ -4,12 +4,13 @@ source_if_exists() { [[ -f ${${(%):-%x}:A:h:h}/$1 ]] && . ${${(%):-%x}:A:h:h}/$1 || return 0 } -export DOMAIN=$(cut -d. -f2- -s <<<${HOST}) -export UNAME=$(uname) +export DOMAIN=${$(cut -d. -f2- -s <<<${HOST}):l} +export HOST=${HOST:l} +export UNAME=${$(uname):l} setopt EXTENDED_GLOB setopt REMATCH_PCRE -source_if_exists dotfiles-${UNAME:l}/zsh/env -source_if_exists dotfiles-${DOMAIN:l}/zsh/env -source_if_exists dotfiles-${HOST:l}/zsh/env +source_if_exists dotfiles-${UNAME}/zsh/env +source_if_exists dotfiles-${DOMAIN}/zsh/env +source_if_exists dotfiles-${HOST}/zsh/env diff --git a/zsh/login b/zsh/login index 756a391..95f8137 100644 --- a/zsh/login +++ b/zsh/login @@ -1,5 +1,5 @@ # -*- mode: shell-script -*- -source_if_exists dotfiles-${UNAME:l}/zsh/login -source_if_exists dotfiles-${DOMAIN:l}/zsh/login -source_if_exists dotfiles-${HOST:l}/zsh/login +source_if_exists dotfiles-${UNAME}/zsh/login +source_if_exists dotfiles-${DOMAIN}/zsh/login +source_if_exists dotfiles-${HOST}/zsh/login diff --git a/zsh/rc b/zsh/rc index cf10a8a..62ae236 100644 --- a/zsh/rc +++ b/zsh/rc @@ -55,8 +55,8 @@ setopt HIST_REDUCE_BLANKS setopt INC_APPEND_HISTORY setopt SHARE_HISTORY -source_if_exists dotfiles-${UNAME:l}/zsh/rc -source_if_exists dotfiles-${DOMAIN:l}/zsh/rc -source_if_exists dotfiles-${HOST:l}/zsh/rc +source_if_exists dotfiles-${UNAME}/zsh/rc +source_if_exists dotfiles-${DOMAIN}/zsh/rc +source_if_exists dotfiles-${HOST}/zsh/rc compinit -d ${XDG_CACHE_HOME}/zsh/compdump -- cgit v1.2.3-70-g09d2