From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 8265 invoked from network); 10 Apr 2022 21:35:45 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 10 Apr 2022 21:35:45 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1649626545; b=JKVP8tfVsohlSzGAyo5mtQc8oDRViWuEOik2iCtDWRXKsY3dFUE035XNQQoP+fRxOJZXFgybaC /qot+Gg4D/fgwza6nNxwk65WrHOedzYlyoYZqEyWo+eAJXs3sxr0KDSGbWihrPyi5xzwjTzwXB e/MXKjozeZii9CzINCcTD9HNkp/rNJ1TMDiofi7qsPpJoF1GeZ/f0FuVgz/NdJw7yKqrkG2YEI 1i7Jf8sAQKoLi356XB6ZqluPRCkuNHDScDyuW19SUxaQYPJMMgwyuOFobvVY2iexhq5sEI/Ksz Gq9zqvAw2+3zVKu7o/l9otNw3/odtWZizvjRBbIZOSsNkA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (wout5-smtp.messagingengine.com) smtp.remote-ip=64.147.123.21; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm3 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1649626545; bh=nUsnGZPb86pV/LQvH1D3D1obBWTgZO7YEqbnGTSc1Lw=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:DKIM-Signature:DKIM-Signature:DKIM-Signature; b=Yw3+rghybGirDE7chpfgZ4bwQBT+m8nEGZST58pFOURfDMl+zDD3MnKWfeJYeLo+g5FBrVM1od GthYb79folwKvzo0UyxdohoYSmoTF54FoZ2zfvi4hZaLyqrNg0Ps9AuiqyQ6KWmJg9wRXcHnHu PZq62spYBNdk5pWI842BPfBrYWqXOY6xEoQ7pWRZtbi2940OpeGdAoVbz8KSiMe5XOhuvB/fLk XpqmTBti5I0qypA/8jr3FqpQ8H/qogitoEIN34cCkjjKghXIzh6alpki7pKRDhfFI5OUYIQwjC 84nao2Ko6RZ4/uFEPkr5t3AH09CNgy13jGvDYY2XGP99zg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=Eb6fFFzm4zartaNHz6NlyF5Qxk8RiNCtjrLmBjC1PpY=; b=l/isv6+FpKThRaVSAdpB6zv3Pa yIgS82RWvljpM6k81iZ9Szau0kGfuQF/a0AuM9dWh+vGIw/rki1ZwPRJYjKWgnT4Q5zCmE5hzfDuz l+7FRM7LeoHrwl8Ha4HdQt9b5lpUsRWxrL6sscn1zf8+N4EXsFlTZSLCJ2RrzmYWgrjOoVsbEnyt7 CGkGfRnFi9NtZP4wcejGEGxMPLvfGInfIn0DkkaKO6mwjR9tjjFKmN96m5MsTifSDC90hP5ReU5+K es7KJ/Gy/Ec26N7YVA1gRQqKxv6IVQQ/Aw9svH0uRPqOi7l9V5ejOPP3jQrWi++XsLHirBXPKYtbH /t5nlNdA==; Received: from authenticated user by zero.zsh.org with local id 1ndfDk-0003S1-Re; Sun, 10 Apr 2022 21:35:44 +0000 Authentication-Results: zsh.org; iprev=pass (wout5-smtp.messagingengine.com) smtp.remote-ip=64.147.123.21; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm3 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:49391) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1ndfDY-00038X-Mo; Sun, 10 Apr 2022 21:35:33 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 1F80F3201F01; Sun, 10 Apr 2022 17:35:31 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 10 Apr 2022 17:35:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; bh=Eb6fFFzm4zarta NHz6NlyF5Qxk8RiNCtjrLmBjC1PpY=; b=MzMYyX/3DTB/Xu9+yA+JIQnbToQbS6 5JCqBR2MPKB/u/cYAka+bj0qrlSucsoTWAucvZqpL6nFP1Y/78MK2beosA6udpw1 4eqzoDjy+iMfQiQYUygQS9ffqf48KsnK4Gd2ALMS4zQcVTo7NLAtC6G8WFI79NKQ uNdeemLotJF7sqwcR14iigszkzaZmJ3wTnbMEcxVTUOrC6AIpTM/nYFP1haEdFn1 ASb9SYKaL0d+5aM8eOYgLMTogoX8dEGO6pfRtw8WuxRdzDZWcBAPVU951nBXGwjn y4f6q7QzpxOXUrGqvP5jQ4mEmouJMQ2nT0NTcnC4O+PIclUs+2ZnoZjw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Eb6fFFzm4zartaNHz 6NlyF5Qxk8RiNCtjrLmBjC1PpY=; b=EX3lbD6NF8LJzHDjwF+Ii0zt8hfM4HN1i Y99URqJrxXy7dSKcnBWyML8e3ddumwElE3T54oS+2k25+xepzlvyjY8eHTbR/uVo dS23mwNe/uFAlO8wAy3yicDSMkKwXB0U/0AU3KV516GzbnG7yzNQWsHV4KUoJr9/ ia4nEuvgPnuHCrD6vRXqUrtWJII4KT0hS5dA75bLPLmZyVb2yU/d0Fwac8gTLFmS +kX1QCXjK2nZQOuySBb+1IWTcIcM8oyf7HdYNJkaUbpj0FhkTfVdeFiWKGdmLt6t gHUR444BaLGH6sIp02wHsvXWXxHuE83LAjDw/q/Y3YmHd/6HAzitQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudekgedgudeitdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjfgesth dttddttdervdenucfhrhhomhepffgrnhhivghlucfuhhgrhhgrfhcuoegurdhssegurghn ihgvlhdrshhhrghhrghfrdhnrghmvgeqnecuggftrfgrthhtvghrnhepueevkeefffeufe ehfefhgefffedviedthedtgeeljeelvdeihfevjeefteegvdeknecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepugdrshesuggrnhhivghlrdhshh grhhgrfhdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 10 Apr 2022 17:35:30 -0400 (EDT) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4Kc4z50zyKzT5; Sun, 10 Apr 2022 21:35:29 +0000 (UTC) Date: Sun, 10 Apr 2022 21:35:29 +0000 From: Daniel Shahaf To: wesley@opndev.io Cc: zsh-workers@zsh.org Subject: Re: [PATCH] Show patchlevel in version string Message-ID: <20220410213529.GD27526@tarpaulin.shahaf.local2> References: <20210903173803.4005670-1-wesley@opperschaap.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210903173803.4005670-1-wesley@opperschaap.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-Seq: 50032 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: 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 > --- > 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 > >