From: Wesley Schwengle <wesley@opperschaap.net>
To: zsh-workers@zsh.org
Subject: [PATCH] Show patchlevel in version string
Date: Fri, 3 Sep 2021 13:38:03 -0400 [thread overview]
Message-ID: <20210903173803.4005670-1-wesley@opperschaap.net> (raw)
When building zsh with a custom patch level you cannot quickly see which
patchlevel you are on via `zsh --version'. When using zsh on Debian or
in my case, where I run the git version of zsh the patch level is hidden
in an environment variable ZSH_PATCHLEVEL. Git for example shows you the
git revision when issues `git --version' as seen here:
$ git --version
git version 2.33.0.113.g6c40894d24
This shows directly what version a user is running without having to
know about ZSH_PATCHLEVEL.
Because I'm not aware how downstream deals with a difference in version
strings I've decided to add it to the vendor/os type bit. Debian for
example uses `debian/5.8-6+b2' as a patch level. This would probably
break scripts which expect `zsh x.y.z' if the patch level replaced the
ZSH_VERSION string.
After this patch is applied, you get to see the following version string
after you configured zsh with `--enable-custom-patchlevel=$(git describe)':
$ ./Src/zsh --version
zsh 5.8.0.2-dev (x86_64-pc-linux-gnu/zsh-5.8-481-g64befeb4c)
Signed-off-by: Wesley Schwengle <wesley@opperschaap.net>
---
Src/init.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Src/init.c b/Src/init.c
index 878a53a37..a04d599c3 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -421,8 +421,14 @@ parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp,
/* GNU-style long options */
++*argv;
if (!strcmp(*argv, "version")) {
+#ifdef CUSTOM_PATCHLEVEL
+ printf("zsh %s (%s-%s-%s/%s)\n",
+ ZSH_VERSION, MACHTYPE, VENDOR, OSTYPE, CUSTOM_PATCHLEVEL);
+#else
printf("zsh %s (%s-%s-%s)\n",
ZSH_VERSION, MACHTYPE, VENDOR, OSTYPE);
+#endif
+
LAST_OPTION(0);
}
if (!strcmp(*argv, "help")) {
--
2.33.0.113.g6c40894d24
next reply other threads:[~2021-09-03 17:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 17:38 Wesley Schwengle [this message]
2022-03-31 5:43 ` Lawrence Velázquez
2022-03-31 7:55 ` Axel Beckert
2023-08-13 18:25 ` Wesley Schwengle
2022-04-10 21:35 ` Daniel Shahaf
2023-08-09 13:05 ` Wesley
2023-08-13 18:54 ` Wesley Schwengle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210903173803.4005670-1-wesley@opperschaap.net \
--to=wesley@opperschaap.net \
--cc=wesley@opndev.io \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).