From 45f87aa9d5b44e4ff2f73be6597d4024bcded8e3 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 7 Mar 2017 19:27:36 +0100 Subject: lib/archroot.sh: Simplify check_root Move the function and save the orig_argv right along it. --- lib/archroot.sh | 13 +++++++++++++ lib/common.sh | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/archroot.sh b/lib/archroot.sh index 25e94fb..7d7ab67 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -1 +1,14 @@ CHROOT_VERSION='v4' + +## +# usage : check_root +## +orig_argv=("$0" "$@") +check_root() { + (( EUID == 0 )) && return + if type -P sudo >/dev/null; then + exec sudo -- "${orig_argv[@]}" + else + exec su root -c "$(printf ' %q' "${orig_argv[@]}")" + fi +} diff --git a/lib/common.sh b/lib/common.sh index 387fb8c..599be54 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -227,15 +227,3 @@ find_cached_package() { return 1 esac } - -## -# usage : check_root ("$0" "$@") -## -check_root() { - (( EUID == 0 )) && return - if type -P sudo >/dev/null; then - exec sudo -- "$@" - else - exec su root -c "$(printf ' %q' "$@")" - fi -} -- cgit v1.2.3-70-g09d2