#!/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:
shift
echo "$@"
}
+ function ax_error {
+ ax_msg 2 "$@" >&2
+ }
fi
unset dir ax_common ax_common_sourced
echo " update-caches"
echo " Force rebuild of all cache files."
echo
- exit 2
+ exit 0
}
function UpdatePluginCache {
[[ -r "$AXZSH/cache" ]] || return 0
- ax_msg - "Updating plugin cache ..."
+ [[ "$1" = "-v" ]] && ax_msg - "Updating plugin cache ..."
rm -rf \
$AXZSH/cache/zlogin.cache \
$AXZSH/cache/zlogout.cache \
function EnableAXZSH {
for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
- ln -sv "$AXZSH/ax.zsh" "$f" \
- || ax_msg 2 "Failed to create symbolic link for \"$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
- ax_msg 2 "Error: Not removing \"$f\", it is not a symbolic link!"
+ 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."
fi
# 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" \
- "$AXZSH/repos/$plugin"
+ ax_msg - "Cloning module from GitHub ..."
+ git clone --depth=1 "https://github.com/$1.git" \
+ "$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 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 "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_msg 2 "Plugin \"$1\" not found!"
+ ax_error "Plugin \"$1\" not found!"
return 1
}
function DisablePlugin {
local plugin=$(NormalizedPluginName "$1")
local dir="$AXZSH/active_plugins"
+ local r=-1
- if [[ ! -h "$dir/$plugin" ]]; then
- ax_msg 1 "Plugin \"$1\" not active?"
- return 1
+ # Active theme?
+ if [[ $(readlink "$AXZSH/active_theme") = "$AXZSH/repos/$plugin/"* ]]; then
+ rm "$AXZSH/active_theme"; r=$?
+ fi
+
+ # Active plugin?
+ if [[ -h "$dir/$plugin" ]]; then
+ rm "$dir/$plugin"; r=$?
+ fi
+
+ if [[ $r -eq -1 ]]; then
+ ax_msg 1 "Plugin \"$1\" not active, nothing to do?"
+ r=1
+ fi
+
+ if [[ "$plugin" = *"#"* ]]; then
+ # Name matches a cloned repository, try to clean up!
+ echo "Cleaning up cloned repository ..."
+ rm -fr "$AXZSH/repos/$plugin"
fi
- rm -v "$dir/$plugin"; r=$?
- [ $r -eq 0 ] && rm -fr "$AXZSH/repos/$plugin"
return $r
}
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 [ $# -ne 1 ]; then
- echo "Usage: axzsh_set_theme <name|->"
- return 1
- fi
-
- rm -f "$link_name" || return 1
-
- if [ "$1" = "-" ]; then
- echo "Theme settings have been reset."
+ 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
- echo "Theme \"$1\" not found!"
- return 1
+ # 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"
+ "$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
+ ax_error "Theme \"$1\" not found!"
+ return 1
+ fi
fi
- ln -sv "$theme" "$link_name" || return 1
+ ln -fs "$theme" "$link_name" || return 1
return $?
}
function UpgradeAXZSH {
if [[ $+commands[git] -eq 0 ]]; then
- ax_msg 2 "The git(1) command is not available!"
+ ax_error "The git(1) command is not available!"
return 1
fi
if [[ ! -d "$AXZSH/.git" ]]; then
- ax_msg 2 "AX-ZSH seems not to be installed using Git. Can't upgrade!"
+ ax_error "AX-ZSH seems not to be installed using Git. Can't upgrade!"
return 1
fi
function UpgradeForeignPlugins {
if [[ $+commands[git] -eq 0 ]]; then
- ax_msg 2 "The git(1) command is not available!"
+ ax_error "The git(1) command is not available!"
return 1
fi
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"
- git pull --ff-only || ax_msg 2 "Pull failed!"
+ git pull --ff-only || ax_error "Pull failed!"
)
else
- ax_msg 2 "Unknown repository type!"
+ ax_error "Unknown repository type!"
fi
done
}
if [[ -z "$AXZSH" || ! -r "$AXZSH/ax.zsh" ]]; then
[[ -r "$HOME/.axzsh/ax.zsh" ]] && AXZSH="$HOME/.axzsh"
if [[ ! -r "$AXZSH/ax.zsh" ]]; then
- ax_msg 2 "Oops, \"AXZSH\" is not set or invalid and can't be autodetected!"
+ ax_error "Oops, \"AXZSH\" is not set or invalid and can't be autodetected!"
exit 3
fi
fi
;;
"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
;;
"update-caches")
[[ $# -eq 0 ]] || Usage
- UpdatePluginCache
+ UpdatePluginCache -v
;;
- *)
+ "--help")
Usage
+ ;;
+ *)
+ ax_error "Invalid command \"$cmd\"!"
+ ax_error "Try \"$0 --help\" for more information."
+ exit 2
esac
projects / ax-zsh.git / blobdiff