Merge pull request #546 from dylanaraps/path2
General: Revert PATH changes and add /usr/sbin and /sbin to PATH
This commit is contained in:
commit
cff43b741b
13
neofetch
13
neofetch
|
@ -16,9 +16,8 @@ XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}"
|
||||||
export LC_ALL=C
|
export LC_ALL=C
|
||||||
export LANG=C
|
export LANG=C
|
||||||
|
|
||||||
# Set PATH to binary directories only
|
# Add /usr/sbin and /sbin to PATH.
|
||||||
# This solves issues with neofetch opening the pacman game.
|
export PATH="/usr/sbin:/sbin:${PATH}"
|
||||||
export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
|
|
||||||
|
|
||||||
# Set no case match.
|
# Set no case match.
|
||||||
shopt -s nocasematch
|
shopt -s nocasematch
|
||||||
|
@ -376,6 +375,14 @@ get_uptime() {
|
||||||
}
|
}
|
||||||
|
|
||||||
get_packages() {
|
get_packages() {
|
||||||
|
# Remove /usr/games from $PATH.
|
||||||
|
# This solves issues with neofetch opening the
|
||||||
|
# 'pacman' game.
|
||||||
|
local PATH=":${PATH}:"
|
||||||
|
local PATH="${PATH/':/usr/games:'/:}"
|
||||||
|
local PATH="${PATH%:}"
|
||||||
|
local PATH="${PATH#:}"
|
||||||
|
|
||||||
case "$os" in
|
case "$os" in
|
||||||
"Linux" | "iPhone OS" | "Solaris")
|
"Linux" | "iPhone OS" | "Solaris")
|
||||||
type -p pacman >/dev/null && \
|
type -p pacman >/dev/null && \
|
||||||
|
|
Reference in New Issue