From 60f9f580fe5c41f062134576dde9a81f6c1cb785 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Thu, 30 Jul 2015 14:40:13 +0200 Subject: [PATCH] Don't hardcode default plugins, read them from ./default_plugins/ --- ax.zsh | 13 ++----------- {plugins => default_plugins}/byebye/byebye.zlogout | 0 .../correction/correction.zshrc | 0 {plugins => default_plugins}/grep/grep.zshrc | 0 {plugins => default_plugins}/history/history.zshrc | 0 {plugins => default_plugins}/less/less.zprofile | 0 {plugins => default_plugins}/ls/ls.zshrc | 0 {plugins => default_plugins}/prompt/prompt.zlogin | 0 {plugins => default_plugins}/ssh/ssh.zprofile | 0 {plugins => default_plugins}/ssh/ssh.zshrc | 0 .../std_aliases/std_aliases.zshrc | 0 .../std_env/std_env.zprofile | 0 .../std_options/std_options.zshrc | 0 13 files changed, 2 insertions(+), 11 deletions(-) rename {plugins => default_plugins}/byebye/byebye.zlogout (100%) rename {plugins => default_plugins}/correction/correction.zshrc (100%) rename {plugins => default_plugins}/grep/grep.zshrc (100%) rename {plugins => default_plugins}/history/history.zshrc (100%) rename {plugins => default_plugins}/less/less.zprofile (100%) rename {plugins => default_plugins}/ls/ls.zshrc (100%) rename {plugins => default_plugins}/prompt/prompt.zlogin (100%) rename {plugins => default_plugins}/ssh/ssh.zprofile (100%) rename {plugins => default_plugins}/ssh/ssh.zshrc (100%) rename {plugins => default_plugins}/std_aliases/std_aliases.zshrc (100%) rename {plugins => default_plugins}/std_env/std_env.zprofile (100%) rename {plugins => default_plugins}/std_options/std_options.zshrc (100%) diff --git a/ax.zsh b/ax.zsh index b3d6d57..ab89ea4 100644 --- a/ax.zsh +++ b/ax.zsh @@ -17,6 +17,7 @@ function axzsh_load_plugin { "$AXZSH_PLUGIN_D/$plugin" "$ZSH_CUSTOM/$plugin" "$AXZSH/plugins/$plugin" + "$AXZSH/default_plugins/$plugin" "$AXZSH/core/$plugin" ); do [[ ! -d "$dname" ]] && continue @@ -67,17 +68,7 @@ fi typeset -U axzsh_default_plugins if ! typeset +m axzsh_default_plugins | fgrep array >/dev/null 2>&1; then axzsh_default_plugins=( - byebye - correction - grep - history - less - ls - prompt - ssh - std_aliases - std_env - std_options + $AXZSH/default_plugins/* ) fi diff --git a/plugins/byebye/byebye.zlogout b/default_plugins/byebye/byebye.zlogout similarity index 100% rename from plugins/byebye/byebye.zlogout rename to default_plugins/byebye/byebye.zlogout diff --git a/plugins/correction/correction.zshrc b/default_plugins/correction/correction.zshrc similarity index 100% rename from plugins/correction/correction.zshrc rename to default_plugins/correction/correction.zshrc diff --git a/plugins/grep/grep.zshrc b/default_plugins/grep/grep.zshrc similarity index 100% rename from plugins/grep/grep.zshrc rename to default_plugins/grep/grep.zshrc diff --git a/plugins/history/history.zshrc b/default_plugins/history/history.zshrc similarity index 100% rename from plugins/history/history.zshrc rename to default_plugins/history/history.zshrc diff --git a/plugins/less/less.zprofile b/default_plugins/less/less.zprofile similarity index 100% rename from plugins/less/less.zprofile rename to default_plugins/less/less.zprofile diff --git a/plugins/ls/ls.zshrc b/default_plugins/ls/ls.zshrc similarity index 100% rename from plugins/ls/ls.zshrc rename to default_plugins/ls/ls.zshrc diff --git a/plugins/prompt/prompt.zlogin b/default_plugins/prompt/prompt.zlogin similarity index 100% rename from plugins/prompt/prompt.zlogin rename to default_plugins/prompt/prompt.zlogin diff --git a/plugins/ssh/ssh.zprofile b/default_plugins/ssh/ssh.zprofile similarity index 100% rename from plugins/ssh/ssh.zprofile rename to default_plugins/ssh/ssh.zprofile diff --git a/plugins/ssh/ssh.zshrc b/default_plugins/ssh/ssh.zshrc similarity index 100% rename from plugins/ssh/ssh.zshrc rename to default_plugins/ssh/ssh.zshrc diff --git a/plugins/std_aliases/std_aliases.zshrc b/default_plugins/std_aliases/std_aliases.zshrc similarity index 100% rename from plugins/std_aliases/std_aliases.zshrc rename to default_plugins/std_aliases/std_aliases.zshrc diff --git a/plugins/std_env/std_env.zprofile b/default_plugins/std_env/std_env.zprofile similarity index 100% rename from plugins/std_env/std_env.zprofile rename to default_plugins/std_env/std_env.zprofile diff --git a/plugins/std_options/std_options.zshrc b/default_plugins/std_options/std_options.zshrc similarity index 100% rename from plugins/std_options/std_options.zshrc rename to default_plugins/std_options/std_options.zshrc -- 2.39.2