From 11f98ed095f3bd638f0632a1601ee6629bd33780 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 17:33:07 +0000 Subject: [PATCH 01/36] Update README.md --- docs/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 6493fcc3..b2ad338a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,16 +5,16 @@ ❮ ZI ❯
+ +[![Project license](https://img.shields.io/github/license/z-shell/zi.svg?style=flat-square)](../LICENSE) [![Version][ver-badge]][ver-link] [![Pull Requests welcome](https://img.shields.io/badge/PRs-welcome-ff69b4.svg?style=flat-square)](https://github.com/z-shell/zi/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) +[![Tweet][twitter-badge]][twitter-link] + 《 Report an issue 》 · 《 Request a Feature 》 · 《 Ask a Question 》

- -[![Project license](https://img.shields.io/github/license/z-shell/zi.svg?style=flat-square)](../LICENSE) [![Version][ver-badge]][ver-link] [![Pull Requests welcome](https://img.shields.io/badge/PRs-welcome-ff69b4.svg?style=flat-square)](https://github.com/z-shell/zi/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) -[![Tweet][twitter-badge]][twitter-link] -
From c9737f99301883ea64dea9cbf1eda885edfdf740 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 17:58:53 +0000 Subject: [PATCH 02/36] Delete Makefile --- docs/zsdoc/Makefile | 62 --------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 docs/zsdoc/Makefile diff --git a/docs/zsdoc/Makefile b/docs/zsdoc/Makefile deleted file mode 100644 index 7f19f11a..00000000 --- a/docs/zsdoc/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# This Makefile is to convert supplied Asciidoc files into -# other formats like pdf and man. The files contain ZI's -# code documentation. -# *.adoc files are generated root directory Makefile. - -all: man pdf - -# MAN -# Converted with a2x from asciidoc package - -man: man/zi.zsh.1 man/side.zsh.1 man/install.zsh.1 man/autoload.zsh.1 - -man/zi.zsh.1: - @mkdir -p man - a2x --verbose -L --doctype manpage --format manpage -D man zi.zsh.adoc - -man/side.zsh.1: - @mkdir -p man - a2x --verbose -L --doctype manpage --format manpage -D man side.zsh.adoc - -man/install.zsh.1: - @mkdir -p man - a2x --verbose -L --doctype manpage --format manpage -D man install.zsh.adoc - -man/autoload.zsh.1: - @mkdir -p man - a2x --verbose -L --doctype manpage --format manpage -D man autoload.zsh.doc - -# PDF -# Uses asciidoctor not a2x (i.e. not asciidoc) - -pdf: pdf/zi.zsh.pdf pdf/side.zsh.pdf pdf/install.zsh.pdf pdf/autoload.zsh.pdf - -pdf/zi.zsh.pdf: - @mkdir -p pdf - asciidoctor -a reproducible -b pdf -r asciidoctor-pdf -D pdf zi.zsh.adoc - -pdf/side.zsh.pdf: - @mkdir -p pdf - asciidoctor -a reproducible -b pdf -r asciidoctor-pdf -D pdf side.zsh.adoc - -pdf/install.zsh.pdf: - @mkdir -p pdf - asciidoctor -a reproducible -b pdf -r asciidoctor-pdf -D pdf install.zsh.adoc - -pdf/autoload.zsh.pdf: - @mkdir -p pdf - asciidoctor -a reproducible -b pdf -r asciidoctor-pdf -D pdf autoload.zsh.adoc - -move: pdf - git clone https://github.com/z-shell/wiki.git - mv *.adoc wiki/ - mv pdf/*.pdf wiki/pdf/ - echo "Docs update: ["`date "+%m/%d/%Y %H:%M:%S"`"]" > wiki/.git/COMMIT_EDITMSG_ - git -C wiki add . - git -C wiki commit -F wiki/.git/COMMIT_EDITMSG_ - git -C wiki push -f origin main - -clean: - rm -rf man pdf data wiki - -.PHONY: man pdf clean From d1fe927f3f302c997a11273d5b941492d74f1b24 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 17:59:10 +0000 Subject: [PATCH 03/36] Delete Makefile --- docs/Makefile | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 docs/Makefile diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 4579a73a..00000000 --- a/docs/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -all: ../zi.zsh.zwc ../lib/zsh/side.zsh.zwc ../lib/zsh/install.zsh.zwc ../lib/zsh/autoload.zsh.zwc - -%.zwc: % - ../lib/zcompile $< - -alltest: test testB testC testD testE -test: - make VERBOSE=$(VERBOSE) NODIFF=$(NODIFF) DEBUG=$(DEBUG) OPTDUMP=$(OPTDUMP) OPTS=$(OPTS) -C test test -testB: - make VERBOSE=$(VERBOSE) NODIFF=$(NODIFF) DEBUG=$(DEBUG) OPTDUMP=$(OPTDUMP) OPTS="kshglob" -C test test -testC: - make VERBOSE=$(VERBOSE) NODIFF=$(NODIFF) DEBUG=$(DEBUG) OPTDUMP=$(OPTDUMP) OPTS="noextendedglob" -C test test -testD: - make VERBOSE=$(VERBOSE) NODIFF=$(NODIFF) DEBUG=$(DEBUG) OPTDUMP=$(OPTDUMP) OPTS="ksharrays" -C test test -testE: - make VERBOSE=$(VERBOSE) NODIFF=$(NODIFF) DEBUG=$(DEBUG) OPTDUMP=$(OPTDUMP) OPTS="ignoreclosebraces" -C test test - -doc: ../zi.zsh ../lib/zsh/side.zsh ../lib/zsh/install.zsh ../lib/zsh/autoload.zsh - rm -rf zsdoc/data zsdoc/*.adoc - zsd -v --scomm --cignore '(\#*FUNCTION:*{{{*|\#[[:space:]]#}}}*)' \ - ../zi.zsh ../lib/zsh/side.zsh ../lib/zsh/install.zsh ../lib/zsh/autoload.zsh - -html: doc - cd zsdoc && \ - asciidoctor zi.zsh.adoc && \ - asciidoctor side.zsh.adoc && \ - asciidoctor install.zsh.adoc && \ - asciidoctor autoload.zsh.adoc && \ - asciidoctor additional.zsh.adoc - -clean: - rm -f ../zi.zsh.zwc ../lib/zsh/side.zsh.zwc ../lib/zsh/install.zsh.zwc ../lib/zsh/autoload.zsh.zwc - rm -rf zsdoc/data - -.PHONY: all clean doc html From 2f9b2930ce7b0248ab914f2627ee08c8720475b0 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 18:01:55 +0000 Subject: [PATCH 04/36] Delete README.md --- lib/git/hooks/post-checkout/README.md | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 lib/git/hooks/post-checkout/README.md diff --git a/lib/git/hooks/post-checkout/README.md b/lib/git/hooks/post-checkout/README.md deleted file mode 100644 index 482084f6..00000000 --- a/lib/git/hooks/post-checkout/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Branch specific `.gitignore` - -This `post-checkout` hook will copy `.gitignore.branch_name in place` of `.git/info/exclude` each time with `git checkout branch_name`. - -## Setup - -1. Create new `.gitignore` files for each branch and name it : `.gitignore.branch_name` -2. In your git repo, go to `.git/hooks/` and copy `post-checkout` file there. -3. Make sure permissions are: `chmod +x post-checkout` and `chmod 755 post-checkout` -4. Just go to the branch you want and type `git status`: **TADAAA** ! From 8732ed37079a14974ff1cad8bdcdedc658bae602 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 18:02:01 +0000 Subject: [PATCH 05/36] Delete post-checkout --- lib/git/hooks/post-checkout/post-checkout | 27 ----------------------- 1 file changed, 27 deletions(-) delete mode 100755 lib/git/hooks/post-checkout/post-checkout diff --git a/lib/git/hooks/post-checkout/post-checkout b/lib/git/hooks/post-checkout/post-checkout deleted file mode 100755 index 18fa29d2..00000000 --- a/lib/git/hooks/post-checkout/post-checkout +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -old_ref="$1" -new_ref="$2" -branch_switched="$3" - -if [[ $branch_switched != '1' ]]; then - exit 0 -fi - -echo "=== POST CHECKOUT ===" -current_branch="$(git rev-parse --abbrev-ref HEAD)" -hook_dir="$(dirname $0)" -root_dir="$(pwd -P)" -info_dir="$root_dir/.git/info" -exclude_target='.gitignore' - -if [[ -f "${root_dir}/${exclude_target}.${current_branch}" ]]; then - echo -e "Use .gitignore.${current_branch} to exclude files" - exclude_target=.gitignore.${current_branch} -fi - -builtin cd "$info_dir" || exit -rm exclude -echo -e "Copy .gitignore.${current_branch} where required" -cp "${root_dir}/${exclude_target}" exclude -echo -e "=== POST CHECKOUT END ===" From 6f4e8f293b3eff8da9b906d25d7bb359b250f805 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 18:02:46 +0000 Subject: [PATCH 06/36] Delete README.md --- lib/git/hooks/pre-commit/README.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 lib/git/hooks/pre-commit/README.md diff --git a/lib/git/hooks/pre-commit/README.md b/lib/git/hooks/pre-commit/README.md deleted file mode 100644 index a7c61cf5..00000000 --- a/lib/git/hooks/pre-commit/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Pre-commit - -Pre-commit config to help while working with specific files, for example generate TOC for '.md' files. - -> See [pre-commit.com](https://pre-commit.com/) for more information. From 5721c1071b97b082dc2f64f1a74551ab0dcb7713 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 18:03:24 +0000 Subject: [PATCH 07/36] Delete .pre-commit-config.yaml --- .../hooks/pre-commit/.pre-commit-config.yaml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 lib/git/hooks/pre-commit/.pre-commit-config.yaml diff --git a/lib/git/hooks/pre-commit/.pre-commit-config.yaml b/lib/git/hooks/pre-commit/.pre-commit-config.yaml deleted file mode 100644 index ef001939..00000000 --- a/lib/git/hooks/pre-commit/.pre-commit-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 - hooks: - - id: check-merge-conflict - - id: no-commit-to-branch - name: Don't commit to main branch - - id: trailing-whitespace - - id: mixed-line-ending - - id: end-of-file-fixer - - id: check-added-large-files - - id: check-toml - - id: check-yaml - args: [--allow-multiple-documents] - # - repo: https://github.com/koalaman/shellcheck-precommit - # rev: v0.8.0 - # hooks: - # - id: shellcheck - # args: ["--severity=warning"] - # - repo: https://github.com/thlorenz/doctoc - # rev: v2.1.0 - # hooks: - # - id: doctoc - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.4.1 - hooks: - - id: prettier From 44b2d70345b694354dd821fa9694d2a75560a73a Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Wed, 15 Dec 2021 18:04:25 +0000 Subject: [PATCH 08/36] Delete release-notes.yml --- .github/templates/release-notes.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/templates/release-notes.yml diff --git a/.github/templates/release-notes.yml b/.github/templates/release-notes.yml deleted file mode 100644 index 2e3c85f3..00000000 --- a/.github/templates/release-notes.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: 💌 Release Notes Preview - -on: - pull_request_target: - branches: [ main ] - issue_comment: - types: [ edited ] - workflow_dispatch: - -jobs: - preview: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: | - git fetch --prune --unshallow --tags - - uses: snyk/release-notes-preview@v1.6.1 - with: - releaseBranch: main - env: - GITHUB_PR_USERNAME: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b6a4e99a2e12962f58e40e88c2134ad1be984555 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 02:42:28 +0000 Subject: [PATCH 09/36] Update README.md --- docs/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index b2ad338a..e41d2758 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,6 +53,8 @@ - [ZI Wiki](https://github.com/z-shell/zi/wiki) - [Code Documentation](https://github.com/z-shell/zi/wiki/Code-Documentation) +> **Tip:** [Advanced repository search](https://github.com/search/advanced?q=&r=z-shell%2Fzi) +> > Curentlly we are working on how to improve and unify documentation in to one place. > If you know how we could improve it, please let us know. Any feedback, **greatly appreciated**. @@ -60,15 +62,11 @@ ### Prerequisites -> **[?]** > Work in progress. ### Installation -> **[?]** > Interactive installation currently in development mode. -> -> After installing and reloading the shell run: zi self-update #### ZI Loader From f2b061a9ebcac29e48863ec624f9c69e041c3e78 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 02:45:55 +0000 Subject: [PATCH 10/36] Update CONTRIBUTING.md --- docs/CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index bedc84b9..15a3dadd 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -6,6 +6,8 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in ## Knowledge Base - [ZI Wiki](https://github.com/z-shell/zi/wiki) +- [Zsh Plugin Standard](https://z-shell.github.io/docs/zsh/Zsh-Plugin-Standard.html) +- [Zsh Native Scripting Handbook](https://z-shell.github.io/docs/zsh/Zsh-Native-Scripting-Handbook.html) ### Zsh Official - [Zsh Site](http://zsh.sourceforge.net/) From dea6d50a7d2181004057f5ce670b8f50fb078b45 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 02:52:47 +0000 Subject: [PATCH 11/36] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index e41d2758..c429755d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -46,7 +46,7 @@ - [Annexes](https://github.com/z-shell/z-annexes) - [Meta Plugins](https://github.com/z-shell/z-a-meta-plugins) -- Capabilities: [0fuUpiPs](https://github.com/z-shell/zi/wiki/Zsh-Plugin-Standard#9-global-capabilities) +- Capabilities: [0fuUpiPs](https://github.com/z-shell/zi/wiki/Zsh-Plugin-Standard#9-global-parameter-holding-the-plugin-managers-capabilities) ## Documentation From 62d47385d00851419cdee962d3fcd8503aef1118 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 10:29:37 +0000 Subject: [PATCH 12/36] Delete zi.zsh --- lib/zsh/zi.zsh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 lib/zsh/zi.zsh diff --git a/lib/zsh/zi.zsh b/lib/zsh/zi.zsh deleted file mode 100755 index cf4eb89a..00000000 --- a/lib/zsh/zi.zsh +++ /dev/null @@ -1,3 +0,0 @@ -0="${(%):-%N}" -0="${${(M)0:#/*}:-$PWD/$0}" -source "${0:A:h}/${name}.zsh" From 5b7f525ed6bc7fe832e8ec5ddf451bce0c1a49f2 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 20:37:57 +0000 Subject: [PATCH 13/36] Update CONTRIBUTING.md --- docs/CONTRIBUTING.md | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 15a3dadd..a1846f4d 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -3,31 +3,11 @@ When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change. Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project. -## Knowledge Base - -- [ZI Wiki](https://github.com/z-shell/zi/wiki) -- [Zsh Plugin Standard](https://z-shell.github.io/docs/zsh/Zsh-Plugin-Standard.html) -- [Zsh Native Scripting Handbook](https://z-shell.github.io/docs/zsh/Zsh-Native-Scripting-Handbook.html) - -### Zsh Official -- [Zsh Site](http://zsh.sourceforge.net/) - - [Zsh FAQ](https://zsh.sourceforge.io/FAQ/) - - [Zsh Documentation](https://zsh.sourceforge.io/Doc/) - - [The Z Shell Manual](https://zsh.sourceforge.io/Doc/Release/index.html#Top) -### Useful -- [Bash 2 Zsh](http://www.bash2zsh.com/) -- [Zsh tips](http://www.zzapper.co.uk/zshtips.html) -- [101 Powerful & Practical ZSH GLOBS](http://www.zzapper.co.uk/101ZshGlobs.php) -- [Practical differences between Bash ans Zsh](https://apple.stackexchange.com/questions/361870/what-are-the-practical-differences-between-bash-and-zsh/361957#361957) -> -- [zshdb - a gdb-like debugger for zsh](https://zshdb.readthedocs.io/en/latest/index.html) -- [Debian Bug report logs: Bugs in package zsh](https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=zsh) - ## Development environment setup **Notes:** - - Any files to support prefered editor should be collaborated and respected across repositories. e.g. [.editorconfig](https://gist.github.com/ss-o/1e8d9f3a710f78330a09ccc47ef6ddb2). - - [Doxygen For Shell Scripts](https://github.com/z-shell/zsdoc) - parses Zsh and Bash scripts. +> Any files to support prefered editor should be collaborated and respected across repositories. e.g. [.editorconfig](https://gist.github.com/ss-o/1e8d9f3a710f78330a09ccc47ef6ddb2). +> [Doxygen For Shell Scripts](https://github.com/z-shell/zsdoc) - parses Zsh and Bash scripts. ### Clean Pull Request guidelines From cd216e9e6f1c7ace3b2ce502a4dd056799f37538 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 20:50:35 +0000 Subject: [PATCH 14/36] Update CONTRIBUTING.md --- docs/CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index a1846f4d..b6f73b2a 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -3,6 +3,12 @@ When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change. Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project. +## Knowledge Base + +- [ZI Wiki](https://github.com/z-shell/zi/wiki) +- [Zsh Plugin Standard](https://z-shell.github.io/docs/zsh/Zsh-Plugin-Standard.html) +- [Zsh Native Scripting Handbook](https://z-shell.github.io/docs/zsh/Zsh-Native-Scripting-Handbook.html) + ## Development environment setup **Notes:** From 26f33b588c94a634718b59ece9c5c0ee3f837c99 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 20:57:52 +0000 Subject: [PATCH 15/36] Update CODEOWNERS --- .github/CODEOWNERS | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 93f7876e..e3d36647 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,19 @@ -* @ss-o +* @ss-o @z-shell + +# Order is important; the last matching pattern takes the most precedence. +*.sh @z-shell +*.md @z-shell + +# You can also use email addresses if you prefer. They'll be used to look up users just like we do for commit author emails. +*.sh z-shell@digitalclouds.dev + +# The `docs/*` pattern will match files like +# `docs/getting-started.md` but not further nested files like +# `docs/build-app/troubleshooting.md`. +#docs/* @z-shell + +# In this example, @z-shell owns any file in an `lib` directory anywhere in your repository. +#lib/ @z-shell + +# In this example, @z-shell owns any file in the `.github` directory in the root of your repository. +#/.github/ @z-shell From d99b6f0ce199a537a4bb2a345425c0240d75d76a Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 20:58:30 +0000 Subject: [PATCH 16/36] Update CODEOWNERS --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e3d36647..4dbea65e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,11 +1,11 @@ * @ss-o @z-shell # Order is important; the last matching pattern takes the most precedence. -*.sh @z-shell -*.md @z-shell +#*.sh @z-shell +#*.md @z-shell # You can also use email addresses if you prefer. They'll be used to look up users just like we do for commit author emails. -*.sh z-shell@digitalclouds.dev +#*.sh z-shell@digitalclouds.dev # The `docs/*` pattern will match files like # `docs/getting-started.md` but not further nested files like From 85a295fe0246bd3cd9a328b209254830ace00ed3 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 21:05:09 +0000 Subject: [PATCH 17/36] Create CHANNELS.md --- .github/CHANNELS.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/CHANNELS.md diff --git a/.github/CHANNELS.md b/.github/CHANNELS.md new file mode 100644 index 00000000..4a9f3271 --- /dev/null +++ b/.github/CHANNELS.md @@ -0,0 +1,13 @@ +# `main` + +The current tip-of-tree, absolute latest cutting edge build. Usually functional, though sometimes we accidentally break things. + +# `dev` + +The latest not fully-tested build. + +# `stable` + +When we believe we have a particularly useful build, we promote it to the stable channel. +We intend to do this more or less every quarter, but this may vary. We may ship hotfixes +to the stable channel for high-priority bugs, although we intend to do this rarely. From 89075612a42770410c4a28d1e2be5a776d1172bb Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Thu, 16 Dec 2021 22:26:00 +0000 Subject: [PATCH 18/36] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index c429755d..63e815f6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -180,7 +180,7 @@ _For more information and to report security issues, please refer to our [securi ## Acknowledgements The [**Z-Shell**](https://github.com/z-shell) was created to recover the `zdharma` organization project which was deleted by the owner. -We don't want to depend on an unreliable source. For this reason started maintaining all tools, everyone interested is welcome join. +We don't want to depend on an unreliable source. For this reason started maintaining all tools, everyone interested are welcome join. [**ZI**](https://github.com/z-shell/zi), formerly known as zplugin, zinit, is an open source community project released under the [MIT License](../LICENSE). ### Authors & contributors From ffa43dcecd455ea15df043f9c06fb6e0d091beb4 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 01:22:50 +0000 Subject: [PATCH 19/36] Update README.md --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 63e815f6..e957a631 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,9 +1,9 @@ -

+

Logo ❮ ZI ❯ -

+
[![Project license](https://img.shields.io/github/license/z-shell/zi.svg?style=flat-square)](../LICENSE) [![Version][ver-badge]][ver-link] [![Pull Requests welcome](https://img.shields.io/badge/PRs-welcome-ff69b4.svg?style=flat-square)](https://github.com/z-shell/zi/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) From 391098d4153952f16e48c13dfc2dc65fbc2d8c8a Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 01:24:41 +0000 Subject: [PATCH 20/36] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index e957a631..c368d751 100644 --- a/docs/README.md +++ b/docs/README.md @@ -180,7 +180,7 @@ _For more information and to report security issues, please refer to our [securi ## Acknowledgements The [**Z-Shell**](https://github.com/z-shell) was created to recover the `zdharma` organization project which was deleted by the owner. -We don't want to depend on an unreliable source. For this reason started maintaining all tools, everyone interested are welcome join. +We don't want to depend on an unreliable source. [**ZI**](https://github.com/z-shell/zi), formerly known as zplugin, zinit, is an open source community project released under the [MIT License](../LICENSE). ### Authors & contributors From 40a92b70753404816949ab860f4c12fb0fe330d0 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:49:07 +0000 Subject: [PATCH 21/36] Update labels.yml --- .github/labels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/labels.yml b/.github/labels.yml index d191164a..ecef60eb 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -30,11 +30,11 @@ color: 5319e7 description: "Work that improves the continuous integration." - name: "dependencies 📦" - color: fbcA04 + color: fbca04 description: "Change in project dependencies." - name: "in-progress ⚡" - color: fbca04 + color: f510f4 description: "Issue is currently being worked on by a developer." - name: "triage 📑" color: fbca04 From 16f978de3aecda032174250fc20ef5fa725b3141 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:52:47 +0000 Subject: [PATCH 22/36] Update labeler.yml --- .github/workflows/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 01c08f38..c4459f29 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,3 +14,4 @@ jobs: - uses: actions/labeler@v3 with: repo-token: "${{ secrets.GH_PAT }}" + sync-labels: true From bb24df76fa6b729e22a3b8219bf4bb3918cc96d4 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:53:42 +0000 Subject: [PATCH 23/36] Update labeler.yml --- .github/workflows/labeler.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index c4459f29..1affe9f4 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,7 +1,8 @@ --- name: 🔖 Pull Request Labeler on: -- pull_request_target + workflow_dispatch: + pull_request_target: permissions: contents: read From 6ca9acf312f365cefad232ce60e6959735f9f4a0 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:56:18 +0000 Subject: [PATCH 24/36] Update labeler.yml --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 1affe9f4..43e5a50d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,5 +14,5 @@ jobs: steps: - uses: actions/labeler@v3 with: - repo-token: "${{ secrets.GH_PAT }}" + repo-token: "${{ secrets.GITHUB_TOKEN }}" sync-labels: true From 0a308d125bcba1923cfde475099c47daeee458cb Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:57:10 +0000 Subject: [PATCH 25/36] Update labeler.yml --- .github/workflows/labeler.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 43e5a50d..13fe1bbf 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,7 +1,6 @@ --- name: 🔖 Pull Request Labeler on: - workflow_dispatch: pull_request_target: permissions: From fba48d8f64b18a8495bb3e6e44e569aff5588ee9 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:57:53 +0000 Subject: [PATCH 26/36] Update lock.yml --- .github/workflows/lock.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 2fe09241..f1807a90 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -4,7 +4,6 @@ name: 🔒 Lock closed issues and PRs on: schedule: - cron: "30 2 * * *" - workflow_dispatch: permissions: issues: write From 6ca4d0fa94bae3d16f6a19799d90c33f2c820dbb Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:59:03 +0000 Subject: [PATCH 27/36] Update rebase.yml --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index fbd86d87..70b3a95b 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -9,7 +9,7 @@ jobs: if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') runs-on: ubuntu-latest steps: - - name: ☑️ Checkout the latest code + - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2 with: token: ${{ secrets.GITHUB_TOKEN }} From c768ea97941b88e45585119dcbfcb00eb6955484 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 05:59:41 +0000 Subject: [PATCH 28/36] Update wiki.yml --- .github/workflows/wiki.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml index 64786fef..f90c46ef 100644 --- a/.github/workflows/wiki.yml +++ b/.github/workflows/wiki.yml @@ -12,7 +12,8 @@ jobs: deploy-wiki: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2 - name: 📩 Add to wiki uses: Andrew-Chen-Wang/github-wiki-action@v2 env: From 72c44783c505dd40621828aa6f78195fb5efa224 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 06:00:20 +0000 Subject: [PATCH 29/36] Update wiki.yml --- .github/workflows/wiki.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml index f90c46ef..5464eaf5 100644 --- a/.github/workflows/wiki.yml +++ b/.github/workflows/wiki.yml @@ -3,7 +3,8 @@ name: 📖 Wiki on: push: - branches: [ wiki ] + branches: + - main paths: - "docs/wiki/**" workflow_dispatch: From 4cc0d1e1e2e9476bfa184871ef0b32644ecff299 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 06:01:06 +0000 Subject: [PATCH 30/36] Update zsh-check.yml --- .github/workflows/zsh-check.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zsh-check.yml b/.github/workflows/zsh-check.yml index e6e3d8f0..63f140b2 100644 --- a/.github/workflows/zsh-check.yml +++ b/.github/workflows/zsh-check.yml @@ -2,7 +2,6 @@ name: ✅ Zsh Check on: - workflow_dispatch: pull_request_target: jobs: @@ -11,7 +10,8 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v2 + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2 - name: "✨ Set matrix output" id: set-matrix run: | @@ -26,7 +26,8 @@ jobs: matrix: ${{ fromJSON(needs.build-matrix.outputs.matrix) }} steps: - - uses: actions/checkout@v2 + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2 - name: "✨ Install dependencies" run: | sudo apt install -y zsh From ac2dcbcd57b54528625f0ccfa76adfc9fb745326 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 15:29:39 +0000 Subject: [PATCH 31/36] Update README.md --- docs/README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/README.md b/docs/README.md index c368d751..dd7f91cc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,9 +2,8 @@ Logo -❮ ZI ❯ - -
+❮ ZI ❯ +
[![Project license](https://img.shields.io/github/license/z-shell/zi.svg?style=flat-square)](../LICENSE) [![Version][ver-badge]][ver-link] [![Pull Requests welcome](https://img.shields.io/badge/PRs-welcome-ff69b4.svg?style=flat-square)](https://github.com/z-shell/zi/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) [![Tweet][twitter-badge]][twitter-link] @@ -38,12 +37,14 @@
---- - ## About + +

- [**ZI**](https://github.com/z-shell/zi) is an interactive, feature-rich and flexible plugin manager for [**Zsh**](https://zsh.sourceforge.io/) - [Unix shell](https://en.wikipedia.org/wiki/Unix_shell). - + [**ZI**](https://github.com/z-shell/zi) is an interactive, feature-rich plugin manager for [**Zsh**](https://zsh.sourceforge.io/) - [Unix shell](https://en.wikipedia.org/wiki/Unix_shell). + +

+ - [Annexes](https://github.com/z-shell/z-annexes) - [Meta Plugins](https://github.com/z-shell/z-a-meta-plugins) - Capabilities: [0fuUpiPs](https://github.com/z-shell/zi/wiki/Zsh-Plugin-Standard#9-global-parameter-holding-the-plugin-managers-capabilities) @@ -53,7 +54,7 @@ - [ZI Wiki](https://github.com/z-shell/zi/wiki) - [Code Documentation](https://github.com/z-shell/zi/wiki/Code-Documentation) -> **Tip:** [Advanced repository search](https://github.com/search/advanced?q=&r=z-shell%2Fzi) +> **Tip:** [Advanced search](https://github.com/search/advanced?q=user%3Az-shell&type=Users) > > Curentlly we are working on how to improve and unify documentation in to one place. > If you know how we could improve it, please let us know. Any feedback, **greatly appreciated**. From ca87b9eef5ff97919e029cb1438eab4eb97ada01 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 17:00:03 +0000 Subject: [PATCH 32/36] Update autoload.zsh --- lib/zsh/autoload.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zsh/autoload.zsh b/lib/zsh/autoload.zsh index 9cf0dace..cda81d30 100755 --- a/lib/zsh/autoload.zsh +++ b/lib/zsh/autoload.zsh @@ -2635,7 +2635,7 @@ builtin print -Pr \"\$ZI[col-obj]Done (with the exit code: \$_retval).%f%b\"" local year="${$(command date "+%Y"):-2020}" command cat >! "${plugin:t}.plugin.zsh" <>! .git/config < Date: Sat, 18 Dec 2021 17:50:31 +0000 Subject: [PATCH 33/36] Update README.md --- docs/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index dd7f91cc..b0da20ca 100644 --- a/docs/README.md +++ b/docs/README.md @@ -45,7 +45,7 @@ -- [Annexes](https://github.com/z-shell/z-annexes) +- [Annexes](https://github.com/z-shell/zannex) - [Meta Plugins](https://github.com/z-shell/z-a-meta-plugins) - Capabilities: [0fuUpiPs](https://github.com/z-shell/zi/wiki/Zsh-Plugin-Standard#9-global-parameter-holding-the-plugin-managers-capabilities) @@ -96,7 +96,7 @@ fi - This will: - Clone and install ZI if missing. - - If successful or not required will load ZI. + - If install successful or not required will load ZI. - Enable ZI completions. - All can be accomplished individually or skipped. The functionality will be attached in documentation subsequently. @@ -105,8 +105,8 @@ fi - Visiting Wiki: - [Introduction](https://github.com/z-shell/zi/wiki/Introduction) - [ZI Annex meta plugins](https://github.com/z-shell/zi/wiki/z-a-meta-plugins) - - [Oh My Zsh integration](https://github.com/z-shell/zi/wiki/Example-Oh-My-Zsh-setup) - - [Gallery](https://github.com/z-shell/zi/wiki/GALLERY) + - [Oh My Zsh integration](https://github.com/z-shell/zi/wiki/Oh-My-Zsh-setup) + - [Gallery](https://github.com/z-shell/zi/wiki/Gallery) #### Interactive install (beta) From 721214a2256dd74f37e22fb9ac3a1b34021704d3 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 18:03:05 +0000 Subject: [PATCH 34/36] Update label-commenter-config.yml --- .github/label-commenter-config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index 12a8086b..345e0b3e 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -1,9 +1,7 @@ comment: header: Hi, there. - footer: "\ - ---\n\n\ - > This is an automated comment. Responding to the bot or mentioning it won't have any effect.\n\n\" - + footer: "\n\n > This is an automated comment. Responding to the bot or mentioning it won't have any effect.\n\n" + labels: - name: invalid ⚠️ labeled: From 3ce0c0e6b727edd2f09b28fd642e04fc7474ecbc Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 22:17:49 +0000 Subject: [PATCH 35/36] deleted: .github/workflows/wiki.yml --- .github/workflows/wiki.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/wiki.yml diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml deleted file mode 100644 index 5464eaf5..00000000 --- a/.github/workflows/wiki.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: 📖 Wiki - -on: - push: - branches: - - main - paths: - - "docs/wiki/**" - workflow_dispatch: - -jobs: - deploy-wiki: - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2 - - name: 📩 Add to wiki - uses: Andrew-Chen-Wang/github-wiki-action@v2 - env: - WIKI_DIR: docs/wiki/ - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GH_MAIL: ${{ secrets.GH_MAIL }} - GH_NAME: ${{ github.repository_owner }} - EXCLUDED_FILES: "docs/wiki/drafts" From f8461f473db027c43c8efde222ccb1317ca39d33 Mon Sep 17 00:00:00 2001 From: Salvydas Lukosius Date: Sat, 18 Dec 2021 22:18:30 +0000 Subject: [PATCH 36/36] Merge from upstream (#2) * Update wiki.yml * Delete wiki.yml