#!/usr/bin/env zsh
#
# AX-ZSH: Alex' Modular ZSH Configuration
-# Copyright (c) 2015-20
17 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-20
20 Alexander Barton <alex@barton.de>
#
-# Include "ax-common.sh", if available:
-for dir ("$HOME/lib" "$HOME/.ax" /usr/local /opt/ax /usr); do
- [[ -z "$ax_common_sourced" ]] || break
- ax_common="${dir}/lib/ax/ax-common.sh"
- [[ -r "$ax_common" ]] && source "$ax_common"
-done
-if [[ -z "$ax_common_sourced" ]]; then
- function ax_msg {
- shift
- echo "$@"
- }
- function ax_error {
- ax_msg 2 "$@" >&2
- }
-fi
-unset dir ax_common ax_common_sourced
+# Embedded ax-common compatibility functions ...
+function ax_msg {
+ case "$1" in
+ "0") c="32"; ;;
+ "1") c="33"; ;;
+ "2") c="31"; ;;
+ "-") c="1"; ;;
+ *) c="0"; ;;
+ esac
+ shift
+ printf "\e[${c}m%s\e[0m\n" "$@"
+}
+function ax_error {
+ ax_msg 2 "$@" >&2
+}
+
+function Version {
+ echo "ax-zsh -- Modular configuration system for the Z shell (ZSH)"
+ echo "Copyright (c) 2015-2019 Alexander Barton <alex@barton.de>."
+ echo "Licensed under the terms of the MIT license, see LICENSE.md for details."
+ echo "Homepage: <https://github.com/alexbarton/ax-zsh>"
+ if [[ -d "$AXZSH/.git" && -n "$commands[git]" ]]; then
+ echo -n "Version: Git ID "
+ ( cd "$AXZSH" && git describe --always )
+ fi
+ echo
+ exit 0
+}
function Usage {
echo "Usage: $NAME <command> [...]"
function UpdatePluginCache {
[[ -r "$AXZSH/cache" ]] || return 0
- ax_msg - "Updating plugin cache ..."
+ [[ "$1" = "-v" ]] && ax_msg - "Updating plugin cache ..."
rm -rf \
+ $AXZSH/cache/ax-io.cache \
$AXZSH/cache/zlogin.cache \
$AXZSH/cache/zlogout.cache \
$AXZSH/cache/zprofile.cache \
$AXZSH/cache/zshrc.cache \
|| return 1
echo "Regenerating cache files ..."
- zsh -ilc '' >/dev/null
+ AXZSH_PLUGIN_CHECK=1 zsh -ilc '' >/dev/null
}
function NormalizedPluginName {
function EnableAXZSH {
for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
- ln -sv "$AXZSH/ax.zsh" "$f" \
+ ln -s "$AXZSH/ax.zsh" "$f" \
|| ax_error "Failed to create symbolic link for \"$f\"!"
done
}
function DisableAXZSH {
for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
- if [ -h "$f" ]; then
- rm -v "$f" || ax_msg 2 "Failed to remove \"$f\"!"
- elif [ -e "$f" ]; then
+ if [[ -h "$f" ]]; then
+ rm "$f" || ax_msg 2 "Failed to remove \"$f\"!"
+ elif [[ -e "$f" ]]; then
ax_error "Error: Not removing \"$f\", it is not a symbolic link!"
else
ax_msg 1 "Warning: \"$f\" already does not exist. Ok."
if [[ ! -e "$AXZSH/repos/$plugin" ]]; then
ax_msg - "Cloning module from GitHub ..."
git clone --depth=1 "https://github.com/$1.git" \
- "$AXZSH/repos/$plugin"
+ "$AXZSH/repos/$plugin" \
+ || ax_error "Failed to clone repository!"
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 1 "Module \"$1\" was enabled as theme \"${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
- echo "Module \"$1\" will be enabled as plugin ..."
+ echo "Trying to enable \"$1\" as plugin ..."
fi
for dname (
); do
[[ ! -d "$dname" ]] && continue
mkdir -p "$dir"
- (
+ if ! (
cd "$dir" || exit 9
- ln -sv "$dname" "$PWD"
- )
- return $?
+ ln -s "$dname" "$PWD"
+ ); then
+ ax_error "Failed to create link!"
+ return 1
+ fi
+ ax_msg 0 "Plugin \"$plugin\" enabled."
+ return 0
done
ax_error "Plugin \"$1\" not found!"
function EnableDefaultPlugins {
local dir="$AXZSH/active_plugins"
- ax_msg - "Activating (linking) default plugins ..."
+ ax_msg - "Activating default plugins ..."
mkdir -p "$dir"
(
cd "$dir" || exit 9
- ln -sfv "$AXZSH/default_plugins/"* "$PWD"
+ ln -sf "$AXZSH/default_plugins/"* "$PWD"
)
return $?
}
function SetTheme {
local link_name="$AXZSH/active_theme"
- if [ "$1" = "-" ]; then
+ # --- Powerlevel10k ---
+ # Remove "instant prompt" configuration, if any ...
+ rm -f "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+
+ if [[ "$1" = "-" ]]; then
rm -f "$link_name" || return 1
ax_msg 0 "Theme settings have been reset."
return 0
fi
- if [ -r "$1" ]; then
+ if [[ -r "$1" ]]; then
theme="$1"
- elif [ -r "$AXZSH/custom_themes/$1.axzshtheme" ]; then
+ elif [[ -r "$AXZSH/custom_themes/$1.axzshtheme" ]]; then
theme="$AXZSH/custom_themes/$1.axzshtheme"
- elif [ -r "$AXZSH/themes/$1.axzshtheme" ]; then
+ elif [[ -r "$AXZSH/themes/$1.axzshtheme" ]]; then
theme="$AXZSH/themes/$1.axzshtheme"
else
+ # Look for theme in specific remote module:
+ for f (
+ "$AXZSH/repos/$1/"*.axzshtheme(N[1])
+ "$AXZSH/repos/$1/"*.zsh-theme(N[1])
+ ); do
+ if [[ -r "$f" ]]; then
+ theme="$f"
+ break
+ fi
+ done
+
# Look for theme inside of installed plugins:
for dname (
"$AXZSH/custom_themes"
break
fi
done
+
if [[ -z "$theme" ]]; then
ax_error "Theme \"$1\" not found!"
return 1
fi
fi
- ln -fsv "$theme" "$link_name" || return 1
+ ln -fs "$theme" "$link_name" || return 1
return $?
}
for dir ($AXZSH/repos/*(N)); do
name=${dir:t:s/#/\//}
- if [ -d "$dir/.git" ]; then
+ if [[ -d "$dir/.git" ]]; then
ax_msg - "Upgrading \"$name\" [git] ..."
(
cd "$dir"
invalid_plugins=()
ax_msg - "Checking plugins ..."
- for dir ($AXZSH/plugins/*(N)); do
+ for dir ($AXZSH/plugins/[a-z0-9]*(N)); do
plugin=${dir:t}
# Test if plugin is already enabled
- [[ -e "$AXZSH/active_plugins/$plugin" ]] \
- && enabled=" (enabled)" \
- || unset enabled
+ if [[ -e "$AXZSH/active_plugins/$plugin" ]]; then
+ printf ' \e[1;32m+\e[m "\e[1m%s\e[m" ... ' "${plugin}"
+ enabled=1
+ else
+ printf ' \e[1;31m-\e[m "%s" ... ' "${plugin}"
+ unset enabled
+ fi
# Test plugin ...
- printf " - \"%s\"%s ... " "$plugin" "$enabled"
new_plugin=""
- for script ($AXZSH/plugins/$plugin/$plugin.{zshrc,zprofile}); do
+ for script ($AXZSH/plugins/$plugin/$plugin.{zshrc,zprofile,ax-io}); do
[[ -r "$script" ]] || continue
AXZSH_PLUGIN_CHECK=1 zsh -i -c "source $script"; r=$?
if [[ $r -eq 0 ]]; then
new_plugin=$plugin
- break
fi
+ break
done
if [[ -n "$new_plugin" ]]; then
detected_plugins+=($new_plugin)
ax_msg 1 "optional."
else
[[ -n "$enabled" ]] && invalid_plugins+=($plugin)
- ax_msg 2 "failed."
+ ax_msg 2 "failed ($r)."
fi
done
echo
;;
"update-caches")
[[ $# -eq 0 ]] || Usage
- UpdatePluginCache
+ UpdatePluginCache -v
+ ;;
+ "--version"|"version")
+ Version >&2
;;
- "--help")
- Usage
+ "--help"|"help")
+ Usage >&2
;;
*)
ax_error "Invalid command \"$cmd\"!"
projects / ax-zsh.git / blobdiff