ax_common="${dir}/lib/ax/ax-common.sh"
[[ -r "$ax_common" ]] && source "$ax_common"
done
-if [[ -z "$ax_common_sourced" || axzsh_is_dumb_terminal ]]; then
+if [[ -z "$ax_common_sourced" ]]; then
function ax_msg {
shift
echo "$@"
# GitHub plugin
mkdir -p "$AXZSH/repos"
if [[ ! -e "$AXZSH/repos/$plugin" ]]; then
- ax_msg - "Cloning plugin from GitHub ..."
- git clone "https://github.com/$1.git" \
+ ax_msg - "Cloning module from GitHub ..."
+ git clone --depth=1 "https://github.com/$1.git" \
"$AXZSH/repos/$plugin"
fi
+ # Try to enable a theme in this "foreign module", but ignore
+ # errors: we don't know if this module provides a theme or is
+ # a "regular" plugin ...
+ if SetTheme "${plugin#*#}" 2>/dev/null; then
+ ax_msg 0 "Module \"$1\" was enabled as theme \"${plugin#*#}\"."
+ # A theme was enabled: So assume that this is a theme
+ # and don't enable it as plugin.
+ return 0
+ fi
fi
for dname (
function SetTheme {
local link_name="$AXZSH/active_theme"
- if [ $# -ne 1 ]; then
- echo "Usage: axzsh_set_theme <name|->"
- return 1
- fi
-
- rm -f "$link_name" || return 1
-
if [ "$1" = "-" ]; then
+ rm -f "$link_name" || return 1
echo "Theme settings have been reset."
return 0
fi
elif [ -r "$AXZSH/themes/$1.axzshtheme" ]; then
theme="$AXZSH/themes/$1.axzshtheme"
else
- echo "Theme \"$1\" not found!"
- return 1
+ # Look for theme inside of installed plugins:
+ for dname (
+ "$AXZSH/custom_themes"
+ "$AXZSH/custom_plugins/"*(N)
+ "$AXZSH/repos/"*(N)
+ ); do
+ if [[ -r "$dname/$1.axzshtheme" ]]; then
+ theme="$dname/$1.axzshtheme"
+ break
+ elif [[ -r "$dname/$1.zsh-theme" ]]; then
+ theme="$dname/$1.zsh-theme"
+ break
+ fi
+ done
+ if [[ -z "$theme" ]]; then
+ echo "Theme \"$1\" not found!"
+ return 1
+ fi
fi
- ln -sv "$theme" "$link_name" || return 1
+ ln -fsv "$theme" "$link_name" || return 1
return $?
}
;;
"enable-default-plugins")
[[ $# -eq 0 ]] || Usage
- EnableDefaultPlugins
- UpdatePluginCache
+ EnableDefaultPlugins && UpdatePluginCache
;;
"check-plugins")
[[ $# -eq 0 ]] || Usage
"set-theme")
[[ $# -eq 1 ]] || Usage
SetTheme "$1"
- UpdatePluginCache
;;
"upgrade")
[[ $# -eq 0 ]] || Usage