diff --git a/roles/home-cli/files/bash_profile b/roles/home-cli/files/bash_profile index ebf359a..1d71be5 100644 --- a/roles/home-cli/files/bash_profile +++ b/roles/home-cli/files/bash_profile @@ -1,22 +1,7 @@ #!/bin/bash -if [ -r /usr/local/etc/bash_profile ] -then - . /usr/local/etc/bash_profile -elif [ -r /etc/bash_profile ] -then - . /etc/bash_profile -fi - -export BASH_ENV="$HOME/.bashrc" - -export _acp_ignore_shrc=1 if [ -r "$HOME/.profile" ] then . "$HOME/.profile" fi -unset _acp_ignore_shrc -if [ -r "$HOME/.bashrc" ] -then - . "$HOME/.bashrc" -fi +export BASH_ENV="$HOME/.bashrc" diff --git a/roles/home-cli/files/bashrc b/roles/home-cli/files/bashrc index 51e6448..2fbc531 100644 --- a/roles/home-cli/files/bashrc +++ b/roles/home-cli/files/bashrc @@ -8,14 +8,6 @@ case "$-" in ;; esac -if [ -r /usr/local/etc/bashrc ] -then - . /usr/local/etc/bashrc -elif [ -r /etc/bashrc ] -then - . /etc/bashrc -fi - set -o emacs set -o noclobber shopt -s histappend diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile index cb13d50..17d120b 100644 --- a/roles/home-cli/files/profile +++ b/roles/home-cli/files/profile @@ -1,12 +1,4 @@ #!/bin/sh -if [ -r /usr/local/etc/profile ] -then - . /usr/local/etc/profile -elif [ -r /etc/profile ] -then - . /etc/profile -fi - export ANSIBLE_NOCOWS=1 export BLOCKSIZE=K export EDITOR=vi @@ -32,10 +24,6 @@ export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/tmp/.runtime-$(id -un)}" # Locale and language. ## Clear the existing locale settings and set options I always want. export TZ=Europe/London # Can override this elsewhere if needed. -if [ -r /etc/locale.conf ] -then - . /etc/locale.conf -fi if [ -r "$XDG_CONFIG_HOME/locale.conf" ] then . "$XDG_CONFIG_HOME/locale.conf" diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc index 7709a63..6617e49 100644 --- a/roles/home-cli/files/shrc +++ b/roles/home-cli/files/shrc @@ -1,8 +1,4 @@ #!/bin/sh -if [ -n "$_acp_ignore_shrc" ] -then - return 1 -fi if [ -n "$_acp_shrc_loaded" ] then return 1 @@ -18,14 +14,6 @@ case "$-" in ;; esac -if [ -r /usr/local/etc/shrc ] -then - . /usr/local/etc/shrc -elif [ -r /etc/shrc ] -then - . /etc/shrc -fi - if [ -d /var/acp ] then export ACP=/var/acp diff --git a/roles/home-cli/files/zprofile b/roles/home-cli/files/zprofile index 76fab1e..822f8fb 100644 --- a/roles/home-cli/files/zprofile +++ b/roles/home-cli/files/zprofile @@ -1,20 +1,5 @@ #!/bin/zsh -if [ -r /usr/local/etc/zprofile ] -then - . /usr/local/etc/zprofile ] -elif [ -r /etc/zprofile ] -then - . /etc/zprofile -fi - -export _acp_ignore_shrc=1 if [ -r "$HOME/.profile" ] then emulate sh -c '. "$HOME/.profile"' fi -unset _acp_ignore_shrc - -if [ -r "$HOME/.zshrc" ] -then - . "$HOME/.zshrc" -fi diff --git a/roles/home-cli/files/zshrc b/roles/home-cli/files/zshrc index 29bdbe4..dcdcf22 100644 --- a/roles/home-cli/files/zshrc +++ b/roles/home-cli/files/zshrc @@ -8,14 +8,6 @@ case "$-" in ;; esac -if [ -r /usr/local/etc/zshrc ] -then - . /usr/local/etc/zshrc -elif [ -r /etc/zshrc ] -then - . /etc/zshrc -fi - autoload -Uz compinit && compinit zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'