From nobody Tue Apr 18 11:38:12 2023 X-Original-To: ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q12403XxVz44yHS for ; Tue, 18 Apr 2023 11:38:24 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q12402khPz4L3K; Tue, 18 Apr 2023 11:38:24 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681817904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HosuOuTFz26CumeyoWzdFX51gujvDxs9QbnGS3uaQ7k=; b=Evc+iaDrcBBkvcfyrf5rdlQEx+HUuRojtentFcCEaYG/Z4pQeEnABS8pigdi5NSJX5aJCd vrB7fwzHQITVj+vLhpx/z2FnTnZBELsYQh5W31a5n0nrhcf/AjZIaNr1Y8fJiR+pUwlBTt +J3j9RUAjR3FPbW8cQvETLBs1jYTrgI9zP/zGbAEvGpR7Ib/QN6uyo+TtoBJiVaKurNyT9 Ldxl7Urm64Vs5qFKPyDqJRsfJKr/5TcMIGkXGQtpUXtSkj4dXfx7u+HdWhZYUHnYJdMCw+ Kyq2lFqVxqdmhl2lcXFKaNxUBMTOKjdqubRXUh7gQ4z/vqemlgMMfW06FoB4Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681817904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HosuOuTFz26CumeyoWzdFX51gujvDxs9QbnGS3uaQ7k=; b=G9Lhbv/L+9FgAFSpAMtHoGuTZBKXKHaya1SMNN2kTnvR4ZNlMSwMyOEGKKdBAjhwTE44az HhWlskt9mecoWZL7vlEqWDISHyPMlc4YmH9m689fi9/AoPmPPdHd+dlCRrboOiY3YaQy1V Nwb4Js7AOfik71JYj4gRWSDOU3WtFdysfKa+f7bdVuWkWXRpVGE1BxcIseykmgJ77J97dP y1L1/9PhtXKz+teJmbAhvK57xN7Y1py/1dRWIx8XiOqdyaur8p+iMagsrDsfBUvn46KFxh 1xBZQGHk9W6WpRdqyFTKCc1yOc6izlGyAa1YvrZYc5Q5nHtyTcxtsFvy7lfDWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681817904; a=rsa-sha256; cv=none; b=Z+TBO1kxt/k/AWEVtTDdUaYUa/514SMTgc2+flOwm+XvlJcMFjxiHhR0i+Sv+xcqn5cuGA xCg9/14xU7oXsRgPHqMIE3SrrTT5l9cmdfAzQpcgPXkH2gzAZlsAcOfE32HlQO55riM+SN fveGxWCs6YiJozxREiYjN1eg1S1f1NqYUOSQNKcWTWVq7doYDIN5nCKP6xXBExdHTVZSTM gRTL3YXnUBNCQfPbS8MW+jw+IHAx3PCDZ0cxQSocR3d8JqEgzGmUgXBnddX+SmvAFLd0oi 5oR5y3C59bqYKePMV/HdZmF82vPn81J8DArPw0pta4mhtzFxQwAKG+9PUVtMIg== Received: from mail-vs1-f45.google.com (mail-vs1-f45.google.com [209.85.217.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Q12401Yq2z13Cr; Tue, 18 Apr 2023 11:38:24 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f45.google.com with SMTP id dl6so13108408vsb.7; Tue, 18 Apr 2023 04:38:24 -0700 (PDT) X-Gm-Message-State: AAQBX9eZwTDBC8jHCh1qhJ4UUHJ119nuZWi9ahnCFlMx6aJWbHXo5DQX 5Pm4XJDMklwHJ5SZ16/y8i7gzOIYi7pms4mpllM= X-Google-Smtp-Source: AKy350Zb4WTElqF97Tu2ZBh1VQ1wMuoMuY6SPp65oe6mLGXi1HWmva8HbA81yC4OD41vvg5A2ZlKYtXCM+XiGMD4sjY= X-Received: by 2002:a05:6102:4710:b0:42c:3c4d:e9a5 with SMTP id ei16-20020a056102471000b0042c3c4de9a5mr10542948vsb.7.1681817903776; Tue, 18 Apr 2023 04:38:23 -0700 (PDT) List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Tue, 18 Apr 2023 12:38:12 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Get ${OSREL} at install time To: Felix Palmen Cc: ports@freebsd.org Content-Type: multipart/alternative; boundary="000000000000bb49e505f99abeaf" X-ThisMailContainsUnwantedMimeParts: N --000000000000bb49e505f99abeaf Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable (...) and a slightly different result: @postexec env osrel=3D$(freebsd-version -u) sed -E -e "s,stable/[0-9]+,stable/${osrel%%.*}," -e "s,releng/[0-9]+,releng/${osrel%%-*}," %%PREFIX%%/etc/gitup.conf "branch" : "releng/.4", "branch" : "stable/", Nuno Teixeira escreveu no dia ter=C3=A7a, 18/04/2023 = =C3=A0(s) 12:28: > pkg-plist: > @postexec env osrel=3D$(freebsd-version -u) sed -E -e > "s|stable\/12|stable\/${osrel%%.*}|" -e > "s|releng\/11.4|releng\/${osrel%%-*}|" %%PREFIX%%/etc/gitup.conf > > result: > --- > "branch" : "releng/", > "branch" : "stable/", > --- > > For sure I'm doing something wrong with syntax. > > Nuno Teixeira escreveu no dia ter=C3=A7a, 18/04/202= 3 > =C3=A0(s) 12:02: > >> Fixed! >> >> (on 13.2-RELEASE) >> >> gitup.conf: >> --- >> "release" : { >> "repository_path" : "/src.git", >> "branch" : "releng/13.2", >> "target_directory" : "/usr/src", >> "ignores" : [ >> "sys/[^\/]+/conf", >> ], >> }, >> >> "stable" : { >> "repository_path" : "/src.git", >> "branch" : "stable/13", >> "target_directory" : "/usr/src", >> "ignores" : [ >> "sys/[^\/]+/conf", >> --- >> >> Nice! I have now a working pkg-post-install. >> Need to have a pkg-plist method working too so it can be discussed the >> best method to use. >> >> Felix Palmen escreveu no dia ter=C3=A7a, 18/04/2023= =C3=A0(s) >> 11:58: >> >>> * Nuno Teixeira [20230418 11:55]: >>> > sed -E -e 's|stable\/12|stable\/${stable}|' -e >>> [...] >>> > sed doesn't subtitute as it uses literal variables >>> >>> The shell doesn't subsitute variables inside single quotes. Try double >>> quotes instead. >>> >>> -- >>> Felix Palmen {private} felix@palmen-it.de >>> -- ports committer (mentee) -- {web} http://palmen-it.de >>> {pgp public key} http://palmen-it.de/pub.txt >>> {pgp fingerprint} 6936 13D5 5BBF 4837 B212 3ACC 54AD E006 9879 F231 >>> >> >> >> -- >> Nuno Teixeira >> FreeBSD Committer (ports) >> > > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --=20 Nuno Teixeira FreeBSD Committer (ports) --000000000000bb49e505f99abeaf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
(...)
and a slightly different result:

@postexec env osrel=3D$(freebsd-version -u) sed -E -e = "s,stable/[0-9]+,stable/${osrel%%.*}," -e "s,releng/[0-9]+,r= eleng/${osrel%%-*}," %%PREFIX%%/etc/gitup.conf

"branch" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 : "releng/.4&q= uot;,
"branch" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 : &qu= ot;stable/",


=
Nuno Teixeira <eduardo@freebsd.org> escreveu no dia ter=C3=A7a,= 18/04/2023 =C3=A0(s) 12:28:
pkg-plist:
@postexec env o= srel=3D$(freebsd-version -u) sed -E -e "s|stable\/12|stable\/${osrel%%= .*}|" -e "s|releng\/11.4|releng\/${osrel%%-*}|" %%PREFIX%%/e= tc/gitup.conf

result:
---
&quo= t;branch" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 : "releng/",
"branch" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 : "stabl= e/",
---

For sure I'm doing som= ething wrong with syntax.

Nuno Teixeira <eduardo@freebsd.org> escreveu no = dia ter=C3=A7a, 18/04/2023 =C3=A0(s) 12:02:
Fixed!

(on 13.2-RELEASE)

gitup.conf:
---=
"release" : {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 "repository_path" =C2=A0: "/src.git= ",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "br= anch" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 : "releng/13.2",=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "target_direc= tory" : "/usr/src",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 "ignores" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= : [
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 "sys/[^\/]+/conf",
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "stable" : {
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "repository_path" =C2=A0: &qu= ot;/src.git",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 "branch" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 : "stable/13= ",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "ta= rget_directory" : "/usr/src",
=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 "ignores" =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0: [
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 "sys/[^\/]+/conf",
---

Nice! I have now a working pkg-post-install.
Need to have a pkg-plist method working too so it can be discussed the bes= t method to use.

Felix Palmen <zirias@freebsd.org> escreveu no dia ter=C3= =A7a, 18/04/2023 =C3=A0(s) 11:58:
* Nuno Teixeira <eduardo@freebsd.org> [20230418 11:55]:
> sed -E -e 's|stable\/12|stable\/${stable}|' -e
[...]
> sed doesn't subtitute as it uses literal variables

The shell doesn't subsitute variables inside single quotes. Try double<= br> quotes instead.

--
=C2=A0Felix Palmen <zirias@FreeBSD.org>=C2=A0 =C2=A0 =C2=A0{private}= =C2=A0 =C2=A0felix@= palmen-it.de
=C2=A0-- ports committer (mentee) --=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 {web}=C2=A0 http://palmen-it.de
=C2=A0{pgp public key}=C2=A0 http://palmen-it.de/pub.txt
=C2=A0{pgp fingerprint} 6936 13D5 5BBF 4837 B212=C2=A0 3ACC 54AD E006 9879 = F231


--
Nuno TeixeiraFreeBSD Committer (ports)


--
Nuno TeixeiraFreeBSD Committer (ports)


--
Nuno Teixeira
FreeBSD Committ= er (ports)
--000000000000bb49e505f99abeaf--