Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] base-files: prefer /usr/local/bin to /usr/bin
@ 2019-10-25  3:53 voidlinux-github
  2019-10-25  7:41 ` voidlinux-github
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: voidlinux-github @ 2019-10-25  3:53 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1543 bytes --]

From 16a32321ba689ddcbf6767a8ba4e77a6ad6933fc 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 | 10 +++++-----
 srcpkgs/base-files/template      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/base-files/files/profile b/srcpkgs/base-files/files/profile
index 947aeada566..9f6b9630d8c 100644
--- a/srcpkgs/base-files/files/profile
+++ b/srcpkgs/base-files/files/profile
@@ -2,22 +2,22 @@
 
 # System wide environment and startup programs.
 
+PATH="/usr/local/bin:/usr/local/sbin${PATH:+:$PATH}"
+
 appendpath () {
     case ":$PATH:" in
-        *:"$1":*)
+        *:"$1":*|*:"$1")
             ;;
         *)
-            PATH="${PATH:+$PATH:}$1"
+            PATH="$PATH:$1"
     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'
+appendpath '/sbin'
 unset appendpath
 
 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"

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

end of thread, other threads:[~2020-01-12  0:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-25  3:53 [PR PATCH] base-files: prefer /usr/local/bin to /usr/bin voidlinux-github
2019-10-25  7:41 ` voidlinux-github
2019-10-25  8:09 ` voidlinux-github
2019-10-26 14:52 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-26 14:52 ` 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

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