From 39d2087ad4ecb0bac474ba605923c3a497d96577 Mon Sep 17 00:00:00 2001 From: Eric Nielsen <4120606+ericbn@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:04:21 -0500 Subject: [PATCH] v1.13.0 --- CHANGELOG.md | 8 +++++++- LICENSE | 2 +- README.md | 19 +++++++++++-------- src/zimfw.zsh.erb | 2 +- zimfw.zsh | 6 +++--- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1848c..d3abf0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +_No unreleased changes._ + +## [1.13.0] - 2024-02-17 ### Added - `--if-command` option to zmodule. This option is equivalent to `--if "(( \${+commands[${1}]} ))"`. +- `mkdir` tool option in `zmodule` that creates an empty directory. This allows + creating modules that contain only externally generated files. ## [1.12.1] - 2023-09-16 @@ -365,7 +370,8 @@ Take your time to review the updated [README.md] and the changes listed below. [termtitle]: https://github.com/zimfw/termtitle [s1ck94]: https://github.com/zimfw/s1ck94 -[Unreleased]: https://github.com/zimfw/zimfw/compare/v1.12.1...HEAD +[Unreleased]: https://github.com/zimfw/zimfw/compare/v1.13.0...HEAD +[1.13.0]: https://github.com/zimfw/zimfw/compare/v1.12.1...v1.13.0 [1.12.1]: https://github.com/zimfw/zimfw/compare/v1.12.0...v1.12.1 [1.12.0]: https://github.com/zimfw/zimfw/compare/v1.11.3...v1.12.0 [1.11.3]: https://github.com/zimfw/zimfw/compare/v1.11.2...v1.11.3 diff --git a/LICENSE b/LICENSE index e7ad0c3..407120c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ MIT License Copyright (c) 2015-2016 Matt Hamilton and contributors -Copyright (c) 2016-2023 Eric Nielsen, Matt Hamilton and contributors +Copyright (c) 2016-2024 Eric Nielsen, Matt Hamilton and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 53eacf5..d9e51a7 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ zation will be done in the same order it's defined. <url> Module absolute path or repository URL. The following URL formats are equivalent: foo, zimfw/foo, https://github.com/zimfw/foo.git. If an absolute path is given, the module is considered externally - installed, and won't be installed or updated by zimfw. + installed and won't be installed or updated by zimfw. -n|--name <module_name> Set a custom module name. Default: the last component in <url>. Slashes can be used inside the name to organize the module into subdirectories. The module will be installed at @@ -239,13 +239,16 @@ Per-module options: Overrides the tag option. Default: the repository default branch. -t|--tag <tag_name> Use specified tag when installing and updating the module. Over- rides the branch option. - -u|--use <git|degit> Install and update the module using the defined tool. Default is - either defined by zstyle ':zim:zmodule' use '<git|degit>', or git - if none is provided. - git requires git itself. Local changes are preserved on updates. - degit requires curl or wget, and currently only works with GitHub + -u|--use <tool_name> Install and update the module using the defined tool. Default is + either defined by zstyle ':zim:zmodule' use '<tool_name>', or git + if none is provided. The tools available are: + git uses the git command. Local changes are preserved on updates. + degit uses curl or wget, and currently only works with GitHub URLs. Modules install faster and take less disk space. Local changes are lost on updates. Git submodules are not supported. + mkdir creates an empty directory. The <url> is only used to set + the module name. Use the -c|--cmd or --on-pull options to execute + the desired command to generate the module files. --no-submodules Don't install or update git submodules. -z|--frozen Don't install or update the module. @@ -255,9 +258,9 @@ Per-module options: Per-module-root options: --if <test> Will only initialize module root if specified test returns a zero exit status. The test is evaluated at every new terminal startup. - --if-command <command> Will only initialize module root if specified external command is + --if-command <cmd_name> Will only initialize module root if specified external command is available. This is evaluated at every new terminal startup. - Equivalent to --if "(( \\\${+commands[\${1}]} ))". + Equivalent to --if '(( ${+commands[<cmd_name>]} ))'. --on-pull <command> Execute command after installing or updating the module. The com- mand is executed in the module root directory. -d|--disabled Don't initialize the module root or uninstall the module. diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb index 08ef8f6..cdf7107 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.12.1" + @version = "1.13.0" @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 42f2be3..7acc2ae 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -4,7 +4,7 @@ # MIT License # # Copyright (c) 2015-2016 Matt Hamilton and contributors -# Copyright (c) 2016-2023 Eric Nielsen, Matt Hamilton and contributors +# Copyright (c) 2016-2024 Eric Nielsen, Matt Hamilton and contributors # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -454,7 +454,7 @@ _zimfw_compile() { } _zimfw_info() { - print -R 'zimfw version: '${_zversion}' (built at 2024-02-17 01:39:24 UTC, previous commit is 8bec2f7)' + print -R 'zimfw version: '${_zversion}' (built at 2024-02-17 02:05:06 UTC, previous commit is 9de3984)' local zparam for zparam in LANG ${(Mk)parameters:#LC_*} OSTYPE TERM TERM_PROGRAM TERM_PROGRAM_VERSION ZIM_HOME ZSH_VERSION; do print -R ${(r.22....:.)zparam}${(P)zparam} @@ -874,7 +874,7 @@ _zimfw_run_tool_action() { zimfw() { builtin emulate -L zsh -o EXTENDED_GLOB - local -r _zversion='1.12.1' _zversion_target=${ZIM_HOME}/.latest_version zusage=$'Usage: \E[1m'${0}$'\E[0m [\E[1m-q\E[0m|\E[1m-v\E[0m] + local -r _zversion='1.13.0' _zversion_target=${ZIM_HOME}/.latest_version zusage=$'Usage: \E[1m'${0}$'\E[0m [\E[1m-q\E[0m|\E[1m-v\E[0m] Actions: \E[1mbuild\E[0m Build \E[1m'${ZIM_HOME}$'/init.zsh\E[0m and \E[1m'${ZIM_HOME}$'/login_init.zsh\E[0m.