X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=7388d5a59743eb30f696805401708f4ed5f5c751;hb=fa436913e158ea35e19728242fe935d0e5e05ad6;hp=92f6585c216cb7347728c31afe81e53efe890eff;hpb=93929f8d9061fe4075ec2c4aa155649c71acc9a0;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 92f6585..7388d5a 100644 --- a/.shellrc +++ b/.shellrc @@ -118,7 +118,7 @@ if test -n "$BASH_VERSION"; then complete -A job j wait for cmd in unset; do - ! has_completion $cmd && complete -A variable -A function $cmd + ! has_completion $cmd && complete -A function -A variable $cmd done if [ -d "$HOME"/.bash_completion.d ]; then @@ -330,12 +330,13 @@ fi include() { cfg="$1" + shift if [ -f "./$cfg" -a -r "./$cfg" ]; then echo "Reading config file \`$cfg'" 1>&2 - . "./$cfg" + . "./$cfg" "$@" elif [ -f "$HOME/lib/config/$cfg" -a -r "$HOME/lib/config/$cfg" ]; then echo "Reading config file \`$HOME/lib/config/$cfg'" 1>&2 - . "$HOME/lib/config/$cfg" + . "$HOME/lib/config/$cfg" "$@" else echo "Cannot find config file \`$cfg'" 1>&2 fi