From da429430ad7aa971d914102030a2362daa55e510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Mon, 21 Dec 2020 23:51:51 +0100 Subject: [PATCH] src/eprefix-activate: better way to detect if the script is sourced MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maciej Barć --- src/eprefix-activate | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/eprefix-activate b/src/eprefix-activate index dd343e6..5f8e329 100644 --- a/src/eprefix-activate +++ b/src/eprefix-activate @@ -72,12 +72,17 @@ eprefix_world() { # >>> Checks # Exit if script is not sourced -if [[ "${0}" != *sh ]] -then - echo "Don't run this script" - echo "Source it instead" - exit 1 -fi +case ${-} in + *i* ) + : + ;; + * ) + echo "${eprefix_bad} Error: not a login shell" + echo "${eprefix_bad} Run: source ${0}" + echo ">>> Exiting the shell" + exit 1 + ;; +esac # Exit if eprefix does not exist if [ ! -d "${EPREFIX}" ]