]> arthur.barton.de Git - ax-zsh.git/commitdiff
ax.zsh: Use ax_plugin_init() instead of init()
authorAlexander Barton <alex@barton.de>
Mon, 10 Apr 2017 11:17:48 +0000 (13:17 +0200)
committerAlexander Barton <alex@barton.de>
Mon, 10 Apr 2017 11:17:48 +0000 (13:17 +0200)
Don't clobber the global namespace, think of 3rd party plugins,
for example.

ax.zsh

diff --git a/ax.zsh b/ax.zsh
index a841af58ccd0d10eb5aea4ccb8580e4ca141a128..01fd76f1b0e7d4ce4fc8271573b2c240dadab39b 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -66,7 +66,7 @@ function axzsh_load_plugin {
 
                if [[ -n "$cache_file" ]]; then
                        # Add plugin data to cache
-                       printf "# BEGIN: %s\ninit()\n{\n" "$fname" >>"$cache_file"
+                       printf "# BEGIN: %s\nax_plugin_init()\n{\n" "$fname" >>"$cache_file"
                        case "$fname" in
                                *"/repos/"*)
                                        echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
@@ -76,7 +76,7 @@ function axzsh_load_plugin {
                                        echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file
                                        "$cat_cmd" "$fname" >>"$cache_file"
                        esac
-                       printf "}\ninit\n# END: %s\n\n" "$fname" >>"$cache_file"
+                       printf "}\nax_plugin_init\n# END: %s\n\n" "$fname" >>"$cache_file"
                fi
        fi
 
@@ -126,6 +126,7 @@ if [[ -r "$cache_file" ]]; then
        [[ -n "$AXZSH_DEBUG" ]] \
                && echo "   - Reading cache file \"$cache_file\" ..."
        source "$cache_file"
+       unfunction ax_plugin_init
 else
        # No cache file available.
        # Setup list of plugins to load: