Re: [PATCH] Show patchlevel in version string

[Daniel Shahaf <d.s@daniel.shahaf.name>]

Wesley Schwengle wrote on Fri, Sep 03, 2021 at 13:38:03 -0400:
> 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)

Adding the git revision there makes sense, I suppose, but why should
this only be done when that configure option is used?  The git revision
is added to ZSH_PATCHLEVEL (which is a shell variable, not an
environment variable) by default, without needing any configure flags.

Or another perspective: CUSTOM_PATCHLEVEL is used to cause
$ZSH_PATCHLEVEL to be set to something other than its default.  So, 
why shouldn't the #else branch emit the default value of $ZSH_PATCHLEVEL?

tl;dr: Why not include the (build's default) value of $ZSH_PATCHLEVEL in
the output?

Cheers,

Daniel


> 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
> 
>