diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ca611f..eb8cc0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -_No unreleased changes._ +### Added + +- Also output zimfw config and zimfw.zsh script paths in `info` action, + following symlinks if any. ## [1.15.1] - 2024-10-10 diff --git a/src/stage2/50_zimfw_info.zsh.erb b/src/stage2/50_zimfw_info.zsh.erb index 1e220c5..ae56209 100644 --- a/src/stage2/50_zimfw_info.zsh.erb +++ b/src/stage2/50_zimfw_info.zsh.erb @@ -1,7 +1,10 @@ _zimfw_info() { + _zimfw_info_print_symlink 'zimfw config' ${_zconfig} + _zimfw_info_print_symlink ZIM_HOME ${ZIM_HOME} + _zimfw_info_print_symlink 'zimfw script' ${__ZIMFW_FILE} print -R 'zimfw version: '${_zversion}' (built at <%= Time.now.utc %>, previous commit is <%= `git rev-parse --short HEAD | tr -d '\r\n'` %>)' local zparam - for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZIM_HOME 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} done } diff --git a/src/stage2/50_zimfw_info_print_symlink.zsh.erb b/src/stage2/50_zimfw_info_print_symlink.zsh.erb new file mode 100644 index 0000000..cefd6b5 --- /dev/null +++ b/src/stage2/50_zimfw_info_print_symlink.zsh.erb @@ -0,0 +1,5 @@ +_zimfw_info_print_symlink() { + print -Rn ${(r.22....:.)1}${2} + if [[ -L ${2} ]] print -Rn ' -> '${2:A} + print +} diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb index a5c76ef..0eeca13 100644 --- a/src/zimfw.zsh.erb +++ b/src/zimfw.zsh.erb @@ -4,7 +4,7 @@ class Zim :bold, :normal, :red, :normalred, :yellow, :normalyellow, :clear_line, :ellipsis, :okay, :warn, :error def initialize - @version = "1.15.1" + @version = "1.16.0-SNAPSHOT" @home = "${ZDOTDIR:-${HOME}}" @min_zsh_version = "5.2" # Matches {ssh,http,https,git}://{user@,}host/org/repo and {user@,}host:org/repo diff --git a/zimfw.zsh b/zimfw.zsh index d0ecef6..8508d3a 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -467,13 +467,22 @@ _zimfw_compile() { } _zimfw_info() { - print -R 'zimfw version: '${_zversion}' (built at 2024-10-10 00:28:19 UTC, previous commit is 331f1c5)' + _zimfw_info_print_symlink 'zimfw config' ${_zconfig} + _zimfw_info_print_symlink ZIM_HOME ${ZIM_HOME} + _zimfw_info_print_symlink 'zimfw script' ${__ZIMFW_FILE} + print -R 'zimfw version: '${_zversion}' (built at 2024-10-10 14:13:57 UTC, previous commit is 84c59ed)' local zparam - for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZIM_HOME 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} done } +_zimfw_info_print_symlink() { + print -Rn ${(r.22....:.)1}${2} + if [[ -L ${2} ]] print -Rn ' -> '${2:A} + print +} + _zimfw_uninstall() { if (( _zprintlevel <= 0 )); then command rm -rf ${_zunused_dirs} || return 1 @@ -946,7 +955,7 @@ _zimfw_run_tool_action() { zimfw() { builtin emulate -L zsh -o EXTENDED_GLOB - local -r _zconfig=${ZIM_CONFIG_FILE:-${ZDOTDIR:-${HOME}}/.zimrc} _zversion='1.15.1' + local -r _zconfig=${ZIM_CONFIG_FILE:-${ZDOTDIR:-${HOME}}/.zimrc} _zversion='1.16.0-SNAPSHOT' local -r zusage=$'Usage: \E[1m'${0}$'\E[0m [\E[1m-q\E[0m|\E[1m-v\E[0m] Actions: