From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] common/environment/setup/install.sh: support encoding in vman
Date: Sun, 30 Apr 2023 20:15:11 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43686@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2023-04-30 18:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-30 18:15 classabbyamp [this message]
2023-05-06 14:39 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43686@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).