Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] setup/git.sh: fix non-portable sed invocation
@ 2023-09-11  2:31 q66
  2023-09-11 11:38 ` q66
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: q66 @ 2023-09-11  2:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/q66/void-packages fix-nonportable-sed
https://github.com/void-linux/void-packages/pull/46010

setup/git.sh: fix non-portable sed invocation
This lets xbps-src work in non-GNU environments.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/46010.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-nonportable-sed-46010.patch --]
[-- Type: text/x-diff, Size: 928 bytes --]

From 32a3ee5c1c199cc2cc0958d72ebd9001b2da7f6b Mon Sep 17 00:00:00 2001
From: q66 <q66@chimera-linux.org>
Date: Mon, 11 Sep 2023 04:30:55 +0200
Subject: [PATCH] setup/git.sh: fix non-portable sed invocation

This lets xbps-src work in non-GNU environments.
---
 common/environment/setup/git.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/git.sh b/common/environment/setup/git.sh
index bd72f2eae3f07..3417e9ec1898a 100644
--- a/common/environment/setup/git.sh
+++ b/common/environment/setup/git.sh
@@ -18,7 +18,7 @@ elif [ -z "${SOURCE_DATE_EPOCH}" ]; then
 		export SOURCE_DATE_EPOCH="$(stat -c %Y ${XBPS_SRCPKGDIR}/${basepkg}/template)"
 	else
 		export SOURCE_DATE_EPOCH=$($XBPS_GIT_CMD -C ${XBPS_DISTDIR} cat-file commit HEAD |
-			sed -n '/^committer /{s/.*> \([0-9][0-9]*\) [-+][0-9].*/\1/p;q}')
+			grep '^committer '|sed 's/.*> \([0-9][0-9]*\) [-+][0-9].*/\1/')
 	fi
 fi
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-09-14  1:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-11  2:31 [PR PATCH] setup/git.sh: fix non-portable sed invocation q66
2023-09-11 11:38 ` q66
2023-09-12  3:41 ` [PR PATCH] [Updated] " q66
2023-09-12  3:41 ` q66
2023-09-12  4:18 ` [PR REVIEW] " sgn
2023-09-12 12:46 ` [PR PATCH] [Updated] " q66
2023-09-14  1:49 ` [PR PATCH] [Merged]: " sgn

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