Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] common/environment/setup/install.sh: support encoding in vman
@ 2023-04-30 18:15 classabbyamp
  2023-05-06 14:39 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 1 reply; 2+ messages in thread
From: classabbyamp @ 2023-04-30 18:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages vman-encoding
https://github.com/void-linux/void-packages/pull/43686

common/environment/setup/install.sh: support encoding in vman
`vman out/foo.fr.UTF-8.1` should install `usr/share/man/fr.UTF-8/man1/foo.1`, not `usr/share/man/fr/man1/foo.UTF-8.1`

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

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



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vman-encoding-43686.patch --]
[-- Type: text/x-diff, Size: 1023 bytes --]

From cae2d36c675a05f61a761114390e707a407d6699 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 30 Apr 2023 14:12:13 -0400
Subject: [PATCH] common/environment/setup/install.sh: support encoding in vman

`vman out/foo.fr.UTF-8.1` should install `usr/share/man/fr.UTF-8/man1/foo.1`,
not `usr/share/man/fr/man1/foo.UTF-8.1`
---
 common/environment/setup/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index b0c5b22f4c2a..ba0845bba5d1 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -94,9 +94,9 @@ _vman() {
 		suffix=${target##*.}
 	fi
 
-	if  [[ $target =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?)\.(.*) ]]
+	if  [[ $target =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?(\.[^.]+)?)\.(.*) ]]
 	then
-		name=${BASH_REMATCH[1]}.${BASH_REMATCH[4]}
+		name=${BASH_REMATCH[1]}.${BASH_REMATCH[5]}
 		mandir=${BASH_REMATCH[2]}/man${suffix:0:1}
 	else
 		name=$target

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

* Re: [PR PATCH] [Merged]: common/environment/setup/install.sh: support encoding in vman
  2023-04-30 18:15 [PR PATCH] common/environment/setup/install.sh: support encoding in vman classabbyamp
@ 2023-05-06 14:39 ` classabbyamp
  0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2023-05-06 14:39 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

common/environment/setup/install.sh: support encoding in vman
https://github.com/void-linux/void-packages/pull/43686

Description:
`vman out/foo.fr.UTF-8.1` should install `usr/share/man/fr.UTF-8/man1/foo.1`, not `usr/share/man/fr/man1/foo.UTF-8.1`

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

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



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

end of thread, other threads:[~2023-05-06 14:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-30 18:15 [PR PATCH] common/environment/setup/install.sh: support encoding in vman classabbyamp
2023-05-06 14:39 ` [PR PATCH] [Merged]: " classabbyamp

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