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"