Compare commits
2 commits
923014aea4
...
f51b548e9e
Author | SHA1 | Date | |
---|---|---|---|
|
f51b548e9e | ||
|
e9279aaa53 |
8 changed files with 30 additions and 28 deletions
|
@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
_No unreleased changes._
|
### Added
|
||||||
|
|
||||||
|
- Also list not installed modules with `list` action, when not in verbose mode.
|
||||||
|
|
||||||
## [1.16.0] - 2024-11-25
|
## [1.16.0] - 2024-11-25
|
||||||
|
|
||||||
|
|
|
@ -206,10 +206,8 @@ Per-call initialization options:
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
if (( _zflags & 1 )); then
|
|
||||||
_znames+=(${zname})
|
_znames+=(${zname})
|
||||||
fi
|
if (( _zeager )); then
|
||||||
if (( _zflags & 2 )); then
|
|
||||||
if [[ ! -e ${zroot_dir} ]]; then
|
if [[ ! -e ${zroot_dir} ]]; then
|
||||||
print -u2 -R "${_zerror}${funcfiletrace[1]}:${_zbold}${zname}: ${zroot_dir}${_znormalred} not found${_znormal}"
|
print -u2 -R "${_zerror}${funcfiletrace[1]}:${_zbold}${zname}: ${zroot_dir}${_znormalred} not found${_znormal}"
|
||||||
_zfailed=1
|
_zfailed=1
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
_zimfw_source_zimrc() {
|
_zimfw_source_zimrc() {
|
||||||
<%= render_all("src/functions/*.erb") %>
|
<%= render_all("src/functions/*.erb") %>
|
||||||
{
|
{
|
||||||
local -r _zflags=${1}
|
local -ri _zeager=${1}
|
||||||
local -i _zfailed=0
|
local -i _zfailed=0
|
||||||
if ! source ${_zconfig} || (( _zfailed )); then
|
if ! source ${_zconfig} || (( _zfailed )); then
|
||||||
print -u2 -R "${_zred}Failed to source ${_zbold}${_zconfig}${_znormal}"
|
print -u2 -R "${_zred}Failed to source ${_zbold}${_zconfig}${_znormal}"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if (( _zflags & 1 && ${#_znames} == 0 )); then
|
if (( ${#_znames} == 0 )); then
|
||||||
print -u2 -R "${_zred}No modules defined in ${_zbold}${_zconfig}${_znormal}"
|
print -u2 -R "${_zred}No modules defined in ${_zbold}${_zconfig}${_znormal}"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -2,6 +2,7 @@ _zimfw_run_list() {
|
||||||
local -r zname=${1}
|
local -r zname=${1}
|
||||||
local -r zdir=${_zdirs[${zname}]}
|
local -r zdir=${_zdirs[${zname}]}
|
||||||
print -nR "${_zbold}${zname}:${_znormal} ${zdir}"
|
print -nR "${_zbold}${zname}:${_znormal} ${zdir}"
|
||||||
|
if [[ ! -e ${zdir} ]] print -n ' (not installed)'
|
||||||
if [[ -z ${_zurls[${zname}]} ]] print -n ' (external)'
|
if [[ -z ${_zurls[${zname}]} ]] print -n ' (external)'
|
||||||
if (( ${_zfrozens[${zname}]} )) print -n ' (frozen)'
|
if (( ${_zfrozens[${zname}]} )) print -n ' (frozen)'
|
||||||
if (( ${_zdisabled_root_dirs[(I)${zdir}]} )) print -n ' (disabled)'
|
if (( ${_zdisabled_root_dirs[(I)${zdir}]} )) print -n ' (disabled)'
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
_zimfw_run_tool_action() {
|
_zimfw_run_tool_action() {
|
||||||
local -i zmaxprocs=0
|
local -i zmaxprocs=0
|
||||||
if [[ ${1} == reinstall ]] zmaxprocs=1
|
if [[ ${1} == reinstall ]] zmaxprocs=1
|
||||||
_zimfw_source_zimrc 1 || return 1
|
_zimfw_source_zimrc 0 || return 1
|
||||||
zargs -n 2 -P ${zmaxprocs} -- "${_znames[@]}" -- _zimfw_run_tool ${1}
|
zargs -n 2 -P ${zmaxprocs} -- "${_znames[@]}" -- _zimfw_run_tool ${1}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,7 +72,7 @@ Options:
|
||||||
local _zrestartmsg=' Restart your terminal for changes to take effect.'
|
local _zrestartmsg=' Restart your terminal for changes to take effect.'
|
||||||
case ${1} in
|
case ${1} in
|
||||||
build)
|
build)
|
||||||
_zimfw_source_zimrc 2 && _zimfw_build || return 1
|
_zimfw_source_zimrc 1 && _zimfw_build || return 1
|
||||||
(( _zprintlevel-- ))
|
(( _zprintlevel-- ))
|
||||||
_zimfw_compile
|
_zimfw_compile
|
||||||
;;
|
;;
|
||||||
|
@ -84,7 +84,8 @@ Options:
|
||||||
help) print -R ${zusage} ;;
|
help) print -R ${zusage} ;;
|
||||||
info) _zimfw_info ;;
|
info) _zimfw_info ;;
|
||||||
list)
|
list)
|
||||||
_zimfw_source_zimrc 3 && zargs -n 1 -- "${_znames[@]}" -- _zimfw_run_list && \
|
_zimfw_source_zimrc $(( _zprintlevel > 1 )) && \
|
||||||
|
zargs -n 1 -- "${_znames[@]}" -- _zimfw_run_list && \
|
||||||
_zimfw_list_unuseds ' (unused)'
|
_zimfw_list_unuseds ' (unused)'
|
||||||
;;
|
;;
|
||||||
check)
|
check)
|
||||||
|
@ -98,13 +99,13 @@ Options:
|
||||||
_zimfw_run_tool_action install || return 1
|
_zimfw_run_tool_action install || return 1
|
||||||
(( _zprintlevel-- ))
|
(( _zprintlevel-- ))
|
||||||
_zimfw_print 'Done with install.' # Only printed in verbose mode
|
_zimfw_print 'Done with install.' # Only printed in verbose mode
|
||||||
_zimfw_source_zimrc 2 && _zimfw_build && _zimfw_compile
|
_zimfw_source_zimrc 1 && _zimfw_build && _zimfw_compile
|
||||||
;;
|
;;
|
||||||
install|update|reinstall)
|
install|update|reinstall)
|
||||||
_zimfw_run_tool_action ${1} || return 1
|
_zimfw_run_tool_action ${1} || return 1
|
||||||
_zimfw_print -R "Done with ${1}.${_zrestartmsg}"
|
_zimfw_print -R "Done with ${1}.${_zrestartmsg}"
|
||||||
(( _zprintlevel-- ))
|
(( _zprintlevel-- ))
|
||||||
_zimfw_source_zimrc 2 && _zimfw_build && _zimfw_compile
|
_zimfw_source_zimrc 1 && _zimfw_build && _zimfw_compile
|
||||||
;;
|
;;
|
||||||
uninstall) _zimfw_source_zimrc 0 && _zimfw_list_unuseds && _zimfw_uninstall ;;
|
uninstall) _zimfw_source_zimrc 0 && _zimfw_list_unuseds && _zimfw_uninstall ;;
|
||||||
check-version) _zimfw_check_version 1 ;;
|
check-version) _zimfw_check_version 1 ;;
|
||||||
|
|
|
@ -4,7 +4,7 @@ class Zim
|
||||||
:bold, :normal, :red, :normalred, :yellow, :normalyellow, :clear_line, :ellipsis, :okay, :warn, :error
|
:bold, :normal, :red, :normalred, :yellow, :normalyellow, :clear_line, :ellipsis, :okay, :warn, :error
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
@version = "1.16.0"
|
@version = "1.17.0-SNAPSHOT"
|
||||||
@home = "${ZDOTDIR:-${HOME}}"
|
@home = "${ZDOTDIR:-${HOME}}"
|
||||||
@min_zsh_version = "5.2"
|
@min_zsh_version = "5.2"
|
||||||
# Matches {ssh,http,https,git}://{user@,}host/org/repo and {user@,}host:org/repo
|
# Matches {ssh,http,https,git}://{user@,}host/org/repo and {user@,}host:org/repo
|
||||||
|
|
24
zimfw.zsh
24
zimfw.zsh
|
@ -325,10 +325,8 @@ Per-call initialization options:
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
if (( _zflags & 1 )); then
|
|
||||||
_znames+=(${zname})
|
_znames+=(${zname})
|
||||||
fi
|
if (( _zeager )); then
|
||||||
if (( _zflags & 2 )); then
|
|
||||||
if [[ ! -e ${zroot_dir} ]]; then
|
if [[ ! -e ${zroot_dir} ]]; then
|
||||||
print -u2 -R "${_zerror}${funcfiletrace[1]}:${_zbold}${zname}: ${zroot_dir}${_znormalred} not found${_znormal}"
|
print -u2 -R "${_zerror}${funcfiletrace[1]}:${_zbold}${zname}: ${zroot_dir}${_znormalred} not found${_znormal}"
|
||||||
_zfailed=1
|
_zfailed=1
|
||||||
|
@ -362,13 +360,13 @@ Per-call initialization options:
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
local -r _zflags=${1}
|
local -ri _zeager=${1}
|
||||||
local -i _zfailed=0
|
local -i _zfailed=0
|
||||||
if ! source ${_zconfig} || (( _zfailed )); then
|
if ! source ${_zconfig} || (( _zfailed )); then
|
||||||
print -u2 -R "${_zred}Failed to source ${_zbold}${_zconfig}${_znormal}"
|
print -u2 -R "${_zred}Failed to source ${_zbold}${_zconfig}${_znormal}"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if (( _zflags & 1 && ${#_znames} == 0 )); then
|
if (( ${#_znames} == 0 )); then
|
||||||
print -u2 -R "${_zred}No modules defined in ${_zbold}${_zconfig}${_znormal}"
|
print -u2 -R "${_zred}No modules defined in ${_zbold}${_zconfig}${_znormal}"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
@ -470,7 +468,7 @@ _zimfw_info() {
|
||||||
_zimfw_info_print_symlink ZIM_HOME ${ZIM_HOME}
|
_zimfw_info_print_symlink ZIM_HOME ${ZIM_HOME}
|
||||||
_zimfw_info_print_symlink 'zimfw config' ${_zconfig}
|
_zimfw_info_print_symlink 'zimfw config' ${_zconfig}
|
||||||
_zimfw_info_print_symlink 'zimfw script' ${__ZIMFW_FILE}
|
_zimfw_info_print_symlink 'zimfw script' ${__ZIMFW_FILE}
|
||||||
print -R 'zimfw version: '${_zversion}' (built at 2024-11-25 13:50:33 UTC, previous commit is 2d5718e)'
|
print -R 'zimfw version: '${_zversion}' (built at 2024-11-27 23:56:10 UTC, previous commit is e9279aa)'
|
||||||
local zparam
|
local zparam
|
||||||
for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZSH_VERSION; do
|
for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZSH_VERSION; do
|
||||||
print -R ${(r.22....:.)zparam}${(P)zparam}
|
print -R ${(r.22....:.)zparam}${(P)zparam}
|
||||||
|
@ -534,6 +532,7 @@ _zimfw_run_list() {
|
||||||
local -r zname=${1}
|
local -r zname=${1}
|
||||||
local -r zdir=${_zdirs[${zname}]}
|
local -r zdir=${_zdirs[${zname}]}
|
||||||
print -nR "${_zbold}${zname}:${_znormal} ${zdir}"
|
print -nR "${_zbold}${zname}:${_znormal} ${zdir}"
|
||||||
|
if [[ ! -e ${zdir} ]] print -n ' (not installed)'
|
||||||
if [[ -z ${_zurls[${zname}]} ]] print -n ' (external)'
|
if [[ -z ${_zurls[${zname}]} ]] print -n ' (external)'
|
||||||
if (( ${_zfrozens[${zname}]} )) print -n ' (frozen)'
|
if (( ${_zfrozens[${zname}]} )) print -n ' (frozen)'
|
||||||
if (( ${_zdisabled_root_dirs[(I)${zdir}]} )) print -n ' (disabled)'
|
if (( ${_zdisabled_root_dirs[(I)${zdir}]} )) print -n ' (disabled)'
|
||||||
|
@ -952,7 +951,7 @@ _zimfw_run_tool() {
|
||||||
_zimfw_run_tool_action() {
|
_zimfw_run_tool_action() {
|
||||||
local -i zmaxprocs=0
|
local -i zmaxprocs=0
|
||||||
if [[ ${1} == reinstall ]] zmaxprocs=1
|
if [[ ${1} == reinstall ]] zmaxprocs=1
|
||||||
_zimfw_source_zimrc 1 || return 1
|
_zimfw_source_zimrc 0 || return 1
|
||||||
zargs -n 2 -P ${zmaxprocs} -- "${_znames[@]}" -- _zimfw_run_tool ${1}
|
zargs -n 2 -P ${zmaxprocs} -- "${_znames[@]}" -- _zimfw_run_tool ${1}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
@ -965,7 +964,7 @@ zimfw() {
|
||||||
local -r _znormal= _zbold= _zred= _znormalred= _zgreen= _zyellow= _znormalyellow=
|
local -r _znormal= _zbold= _zred= _znormalred= _zgreen= _zyellow= _znormalyellow=
|
||||||
fi
|
fi
|
||||||
local -r _zerror="${_zred}x " _zokay="${_zgreen}) ${_znormal}" _zwarn="${_zyellow}! "
|
local -r _zerror="${_zred}x " _zokay="${_zgreen}) ${_znormal}" _zwarn="${_zyellow}! "
|
||||||
local -r _zconfig=${ZIM_CONFIG_FILE:-${ZDOTDIR:-${HOME}}/.zimrc} _zversion='1.16.0'
|
local -r _zconfig=${ZIM_CONFIG_FILE:-${ZDOTDIR:-${HOME}}/.zimrc} _zversion='1.17.0-SNAPSHOT'
|
||||||
local -r zusage="Usage: ${_zbold}${0}${_znormal} <action> [${_zbold}-q${_znormal}|${_zbold}-v${_znormal}]
|
local -r zusage="Usage: ${_zbold}${0}${_znormal} <action> [${_zbold}-q${_znormal}|${_zbold}-v${_znormal}]
|
||||||
|
|
||||||
Actions:
|
Actions:
|
||||||
|
@ -1031,7 +1030,7 @@ Options:
|
||||||
local _zrestartmsg=' Restart your terminal for changes to take effect.'
|
local _zrestartmsg=' Restart your terminal for changes to take effect.'
|
||||||
case ${1} in
|
case ${1} in
|
||||||
build)
|
build)
|
||||||
_zimfw_source_zimrc 2 && _zimfw_build || return 1
|
_zimfw_source_zimrc 1 && _zimfw_build || return 1
|
||||||
(( _zprintlevel-- ))
|
(( _zprintlevel-- ))
|
||||||
_zimfw_compile
|
_zimfw_compile
|
||||||
;;
|
;;
|
||||||
|
@ -1043,7 +1042,8 @@ Options:
|
||||||
help) print -R ${zusage} ;;
|
help) print -R ${zusage} ;;
|
||||||
info) _zimfw_info ;;
|
info) _zimfw_info ;;
|
||||||
list)
|
list)
|
||||||
_zimfw_source_zimrc 3 && zargs -n 1 -- "${_znames[@]}" -- _zimfw_run_list && \
|
_zimfw_source_zimrc $(( _zprintlevel > 1 )) && \
|
||||||
|
zargs -n 1 -- "${_znames[@]}" -- _zimfw_run_list && \
|
||||||
_zimfw_list_unuseds ' (unused)'
|
_zimfw_list_unuseds ' (unused)'
|
||||||
;;
|
;;
|
||||||
check)
|
check)
|
||||||
|
@ -1057,13 +1057,13 @@ Options:
|
||||||
_zimfw_run_tool_action install || return 1
|
_zimfw_run_tool_action install || return 1
|
||||||
(( _zprintlevel-- ))
|
(( _zprintlevel-- ))
|
||||||
_zimfw_print 'Done with install.' # Only printed in verbose mode
|
_zimfw_print 'Done with install.' # Only printed in verbose mode
|
||||||
_zimfw_source_zimrc 2 && _zimfw_build && _zimfw_compile
|
_zimfw_source_zimrc 1 && _zimfw_build && _zimfw_compile
|
||||||
;;
|
;;
|
||||||
install|update|reinstall)
|
install|update|reinstall)
|
||||||
_zimfw_run_tool_action ${1} || return 1
|
_zimfw_run_tool_action ${1} || return 1
|
||||||
_zimfw_print -R "Done with ${1}.${_zrestartmsg}"
|
_zimfw_print -R "Done with ${1}.${_zrestartmsg}"
|
||||||
(( _zprintlevel-- ))
|
(( _zprintlevel-- ))
|
||||||
_zimfw_source_zimrc 2 && _zimfw_build && _zimfw_compile
|
_zimfw_source_zimrc 1 && _zimfw_build && _zimfw_compile
|
||||||
;;
|
;;
|
||||||
uninstall) _zimfw_source_zimrc 0 && _zimfw_list_unuseds && _zimfw_uninstall ;;
|
uninstall) _zimfw_source_zimrc 0 && _zimfw_list_unuseds && _zimfw_uninstall ;;
|
||||||
check-version) _zimfw_check_version 1 ;;
|
check-version) _zimfw_check_version 1 ;;
|
||||||
|
|
Loading…
Reference in a new issue