1
0
Fork 0
mirror of synced 2024-11-03 00:18:57 -04:00
This commit is contained in:
Eric Nielsen 2022-05-09 18:36:03 -05:00
parent 741bb78a04
commit d6b4aa6ff4
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
5 changed files with 19 additions and 14 deletions

View file

@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
_No unreleased changes._
## [1.9.0] - 2022-05-09
### Added ### Added
- `--on-pull` option to `zmodule`, which allows setting a command that is always triggered - `--on-pull` option to `zmodule`, which allows setting a command that is always
after the module is installed or updated. triggered after the module is installed or updated.
## [1.8.0] - 2022-01-25 ## [1.8.0] - 2022-01-25
@ -274,7 +278,8 @@ Take your time to review the updated [README.md] and the changes listed below.
[termtitle]: https://github.com/zimfw/termtitle [termtitle]: https://github.com/zimfw/termtitle
[s1ck94]: https://github.com/zimfw/s1ck94 [s1ck94]: https://github.com/zimfw/s1ck94
[Unreleased]: https://github.com/zimfw/zimfw/compare/v1.8.0...HEAD [Unreleased]: https://github.com/zimfw/zimfw/compare/v1.9.0...HEAD
[1.9.0]: https://github.com/zimfw/zimfw/compare/v1.8.0...v1.9.0
[1.8.0]: https://github.com/zimfw/zimfw/compare/v1.7.0...v1.8.0 [1.8.0]: https://github.com/zimfw/zimfw/compare/v1.7.0...v1.8.0
[1.7.0]: https://github.com/zimfw/zimfw/compare/v1.6.2...v1.7.0 [1.7.0]: https://github.com/zimfw/zimfw/compare/v1.6.2...v1.7.0
[1.6.2]: https://github.com/zimfw/zimfw/compare/v1.6.1...v1.6.2 [1.6.2]: https://github.com/zimfw/zimfw/compare/v1.6.1...v1.6.2

View file

@ -21,11 +21,11 @@ print_okay() {
handle() { handle() {
if [[ -n ${ONPULL} ]]; then if [[ -n ${ONPULL} ]]; then
if ! ERR=$(builtin cd -q ${DIR} 2>&1 && eval ${ONPULL} 2>&1); then if ! ERR=$(builtin cd -q ${DIR} 2>&1 && builtin eval ${ONPULL} 2>&1); then
print_error 'Error during on-pull' ${ERR} print_error 'Error during on-pull' ${ERR}
return 1 return 1
elif [[ ${PRINTLEVEL} -gt 1 && -n ${ERR} ]]; then elif [[ ${PRINTLEVEL} -gt 1 && -n ${ERR} ]]; then
set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR} builtin set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR}
fi fi
fi fi
print_okay "${@}" print_okay "${@}"

View file

@ -14,11 +14,11 @@ print_okay() {
handle() { handle() {
if [[ -n ${ONPULL} ]]; then if [[ -n ${ONPULL} ]]; then
if ! ERR=$(builtin cd -q ${DIR} 2>&1 && eval ${ONPULL} 2>&1); then if ! ERR=$(builtin cd -q ${DIR} 2>&1 && builtin eval ${ONPULL} 2>&1); then
print_error 'Error during on-pull' ${ERR} print_error 'Error during on-pull' ${ERR}
return 1 return 1
elif [[ ${PRINTLEVEL} -gt 1 && -n ${ERR} ]]; then elif [[ ${PRINTLEVEL} -gt 1 && -n ${ERR} ]]; then
set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR} builtin set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR}
fi fi
fi fi
print_okay "${@}" print_okay "${@}"

View file

@ -4,7 +4,7 @@ class Zim
:clear_line, :ellipsis, :okay, :warn, :error, :done, :failed :clear_line, :ellipsis, :okay, :warn, :error, :done, :failed
def initialize def initialize
@version = "1.9.0-SNAPSHOT" @version = "1.9.0"
@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

View file

@ -384,7 +384,7 @@ _zimfw_compile() {
} }
_zimfw_info() { _zimfw_info() {
print -R 'zimfw version: '${_zversion}' (built at 2022-05-07 21:29:52 UTC, previous commit is e0fe8ef)' print -R 'zimfw version: '${_zversion}' (built at 2022-05-09 23:35:03 UTC, previous commit is 741bb78)'
print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'ZIM_HOME: '${ZIM_HOME}
print -R 'Zsh version: '${ZSH_VERSION} print -R 'Zsh version: '${ZSH_VERSION}
print -R 'System info: '$(command uname -a) print -R 'System info: '$(command uname -a)
@ -517,11 +517,11 @@ print_okay() {
handle() { handle() {
if [[ -n \${ONPULL} ]]; then if [[ -n \${ONPULL} ]]; then
if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && eval \${ONPULL} 2>&1); then if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && builtin eval \${ONPULL} 2>&1); then
print_error 'Error during on-pull' \${ERR} print_error 'Error during on-pull' \${ERR}
return 1 return 1
elif [[ \${PRINTLEVEL} -gt 1 && -n \${ERR} ]]; then elif [[ \${PRINTLEVEL} -gt 1 && -n \${ERR} ]]; then
set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR} builtin set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR}
fi fi
fi fi
print_okay \"\${@}\" print_okay \"\${@}\"
@ -662,11 +662,11 @@ print_okay() {
handle() { handle() {
if [[ -n \${ONPULL} ]]; then if [[ -n \${ONPULL} ]]; then
if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && eval \${ONPULL} 2>&1); then if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && builtin eval \${ONPULL} 2>&1); then
print_error 'Error during on-pull' \${ERR} print_error 'Error during on-pull' \${ERR}
return 1 return 1
elif [[ \${PRINTLEVEL} -gt 1 && -n \${ERR} ]]; then elif [[ \${PRINTLEVEL} -gt 1 && -n \${ERR} ]]; then
set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR} builtin set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR}
fi fi
fi fi
print_okay \"\${@}\" print_okay \"\${@}\"
@ -754,7 +754,7 @@ esac
zimfw() { zimfw() {
builtin emulate -L zsh -o EXTENDED_GLOB builtin emulate -L zsh -o EXTENDED_GLOB
local -r _zversion='1.9.0-SNAPSHOT' zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b] local -r _zversion='1.9.0' zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b]
Actions: Actions:
%Bbuild%b Build %B${ZIM_HOME}/init.zsh%b and %B${ZIM_HOME}/login_init.zsh%b. %Bbuild%b Build %B${ZIM_HOME}/init.zsh%b and %B${ZIM_HOME}/login_init.zsh%b.