From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] base-files: prefer /usr/local/bin to /usr/bin
Date: Sat, 26 Oct 2019 16:52:53 +0200 [thread overview]
Message-ID: <20191026145253.SO2zvod0jIN6cjIWq5QOcIoBR3DipMZvZZ0geYI-OzY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15783@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages etc-profile
https://github.com/void-linux/void-packages/pull/15783
base-files: prefer /usr/local/bin to /usr/bin
Fix #15781
A patch file from https://github.com/void-linux/void-packages/pull/15783.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-etc-profile-15783.patch --]
[-- Type: text/x-diff, Size: 1683 bytes --]
From f1db00c0471534855104276ca6aee2f2442f9fb4 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Fri, 25 Oct 2019 10:30:37 +0700
Subject: [PATCH] base-files: prefer /usr/local/bin to /usr/bin
Fix #15781
---
srcpkgs/base-files/files/profile | 20 ++++++++++----------
srcpkgs/base-files/template | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/base-files/files/profile b/srcpkgs/base-files/files/profile
index 947aeada566..c43120ca632 100644
--- a/srcpkgs/base-files/files/profile
+++ b/srcpkgs/base-files/files/profile
@@ -2,23 +2,23 @@
# System wide environment and startup programs.
-appendpath () {
+prependpath () {
case ":$PATH:" in
- *:"$1":*)
+ *:"$1":*|"$1":*|"$1")
;;
*)
- PATH="${PATH:+$PATH:}$1"
+ PATH="$1${PATH:+:$PATH}"
esac
}
# Set our default path (/usr/sbin:/sbin:/bin included for non-Void chroots)
-appendpath '/usr/local/sbin'
-appendpath '/usr/local/bin'
-appendpath '/usr/bin'
-appendpath '/usr/sbin'
-appendpath '/sbin'
-appendpath '/bin'
-unset appendpath
+prependpath '/sbin'
+prependpath '/bin'
+prependpath '/usr/sbin'
+prependpath '/usr/bin'
+prependpath '/usr/local/sbin'
+prependpath '/usr/local/bin'
+unset prependpath
export PATH
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index a049c59681d..0c517253b23 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
# Template file for 'base-files'
pkgname=base-files
version=0.140
-revision=8
+revision=9
bootstrap=yes
depends="xbps-triggers"
short_desc="Void Linux base system files"
next prev parent reply other threads:[~2019-10-26 14:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 3:53 [PR PATCH] " voidlinux-github
2019-10-25 7:41 ` voidlinux-github
2019-10-25 8:09 ` voidlinux-github
2019-10-26 14:52 ` voidlinux-github [this message]
2019-10-26 14:52 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-29 6:37 ` voidlinux-github
2019-10-29 6:37 ` voidlinux-github
2020-01-12 0:23 ` [PR PATCH] [Closed]: " voidlinux-github
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=20191026145253.SO2zvod0jIN6cjIWq5QOcIoBR3DipMZvZZ0geYI-OzY@z \
--to=voidlinux-github@inbox.vuxu.org \
--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).