From b936c92e3481c0bb64cfb005d4f69d3ed62c6efa Mon Sep 17 00:00:00 2001 From: thek4n Date: Wed, 6 Dec 2023 14:44:16 +0300 Subject: [PATCH] fix HOST specific directory for bash --- home/user/.config/bash/functions | 6 +++--- home/user/.config/bash/sourcer | 7 +++---- home/user/.config/zsh/sourcer | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/home/user/.config/bash/functions b/home/user/.config/bash/functions index be6904c..33aaac3 100644 --- a/home/user/.config/bash/functions +++ b/home/user/.config/bash/functions @@ -1,8 +1,8 @@ _sod() { - if [ -d "$1" ] && [ -n "$(ls "$1"/ 2>/dev/null)" ]; then - for FILENAME in $(ls "$1"/ | sort -n) + if [ -d "$1" ] && [ -n "$(ls "$1")" ]; then + for FILENAME in $(ls "$1" | sort -n) do - source "$1"/"$FILENAME" + source "$1/$FILENAME" done fi } diff --git a/home/user/.config/bash/sourcer b/home/user/.config/bash/sourcer index 3d9b001..8d385cb 100644 --- a/home/user/.config/bash/sourcer +++ b/home/user/.config/bash/sourcer @@ -1,6 +1,5 @@ - -_so () { - [ -r "$1" ] && source "$1" +_so() { + [ -r "$1" ] && [ -f "$1" ] && source "$1" } if [[ $0 == *bash ]]; then @@ -13,7 +12,7 @@ if [[ $- == *i* ]]; then _so "$HOME/.config/bash/aliases" _so "$HOME/.config/bash/functions" _so "$HOME/.config/bash/completion" - _so "$HOME/.config/bash/hosts/$HOST" + _so "$HOME/.config/bash/hosts/$HOSTNAME" fi diff --git a/home/user/.config/zsh/sourcer b/home/user/.config/zsh/sourcer index e8901d3..4907f37 100644 --- a/home/user/.config/zsh/sourcer +++ b/home/user/.config/zsh/sourcer @@ -1,6 +1,5 @@ - -_so () { - [ -f "$1" ] && source "$1" +_so() { + [ -r "$1" ] && [ -f "$1" ] && source "$1" } _so /etc/zsh_command_not_found