axzshctl: Use /usr/bin/env shebang to call zsh

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index f5b8acab994a7e387cc42ec03eaf118a86b26846..9d5eff027a2dc60f9ae31b75c8a839eaed48de24 100755 (executable)
--- a/bin/axzshctl
+++ b/bin/axzshctl
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 #
 # AX-ZSH: Alex' Modular ZSH Configuration
 # Copyright (c) 2015-2016 Alexander Barton <alex@barton.de>
@@ -12,10 +12,6 @@ for dir ("$HOME/lib" "$HOME/.ax" /usr/local /opt/ax /usr); do
 done
 if [[ -z "$ax_common_sourced" ]]; then
        function ax_msg {
-               case "$1" in
-                 "1"|"2") echo -n "! "; ;;
-                 *) echo -n "* "; ;;
-               esac
                shift
                echo "$@"
        }
@@ -213,13 +209,6 @@ function CheckPlugins {
        for dir ($AXZSH/plugins/*(N)); do
                plugin=$(basename "$dir")
 
-               # Check plugin blacklist
-               case "$plugin" in
-                       "ssh_secure"|"zkbd")
-                               continue
-                               ;;
-               esac
-
                # Test if plugin is already enabled
                [[ -e "$AXZSH/active_plugins/$plugin" ]] \
                        && enabled=" (enabled)" \
@@ -230,7 +219,7 @@ function CheckPlugins {
                new_plugin=""
                for script ($AXZSH/plugins/$plugin/$plugin.{zshrc,zprofile}); do
                        [[ -r "$script" ]] || continue
-                       zsh -i -c "source $script"; r=$?
+                       zsh -i -c "AXZSH_PLUGIN_CHECK=1 source $script"; r=$?
                        if [[ $r -eq 0 ]]; then
                                new_plugin=$plugin
                                break
@@ -240,6 +229,10 @@ function CheckPlugins {
                        detected_plugins+=($new_plugin)
                        [[ -n "$enabled" ]] || missing_plugins+=($new_plugin)
                        ax_msg 0 "OK."
+               elif [[ $r -eq 91 ]]; then
+                       ax_msg 1 "ignored."
+               elif [[ $r -eq 92 ]]; then
+                       ax_msg 1 "optional."
                else
                        [[ -n "$enabled" ]] && invalid_plugins+=($plugin)
                        ax_msg 2 "failed."