From ee593c6930c0b4833880cea309c73437107afe03 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 16 May 2020 16:30:49 +0300 Subject: init: set PATH in rc.lib --- rc.boot | 3 --- rc.lib | 1 + rc.shutdown | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/rc.boot b/rc.boot index cc31d00..e0d9951 100755 --- a/rc.boot +++ b/rc.boot @@ -15,9 +15,6 @@ mnt() { mount "$@" "$mnt" } -# Manually set path -PATH=$PATH:/usr/bin:/usr/local/bin - # Display a pretty welcome message printf '\033[1;36m-> \033[39mWelcome to \033[35mCarbs %s\033[39m!\033[m\n' "$(uname -s)" diff --git a/rc.lib b/rc.lib index 8924aa3..f21fc61 100644 --- a/rc.lib +++ b/rc.lib @@ -1,6 +1,7 @@ # rc.lib -- common functions for rc.boot and rc.shutdown # shellcheck disable=1090 +export PATH=$PATH:/usr/local/bin:/usr/bin out() { printf '\033[1;36m-> \033[39m%s\033[m\n' "$@" ;} err() { printf '\033[1;31m!> \033[39m%s\033[m\n' "$@" ;} diff --git a/rc.shutdown b/rc.shutdown index 219e775..292284f 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -4,8 +4,6 @@ . /etc/init/rc.conf . /usr/lib/init/rc.lib -PATH=$PATH:/usr/local/bin:/usr/bin - run_hook pre.shutdown command -v sv >/dev/null && -- cgit v1.2.3