more compatible require_root

IvanKulagin · Dec 23, 2021 · 2f5c6b7 · 2f5c6b7
1 parent a806225
commit 2f5c6b7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/blockcheck.sh b/blockcheck.sh
@@ -87,11 +87,13 @@ ask_yes_no_var()
 
 require_root()
 {
+	local exe
 	echo \* checking privileges
 	[ $(id -u) -ne "0" ] && {
 		echo root is required
-		exists sudo && exec sudo "$0"
-		exists su && exec su -c "$0"
+		exe="$EXEDIR/$(basename "$0")"
+		exists sudo && exec sudo "$exe"
+		exists su && exec su root -c "$exe"
 		echo su or sudo not found
 		exitp 2
 	}

diff --git a/install_easy.sh b/install_easy.sh
@@ -55,11 +55,13 @@ exitp()
 
 require_root()
 {
+	local exe
 	echo \* checking privileges
 	[ $(id -u) -ne "0" ] && {
 		echo root is required
-		exists sudo && exec sudo "$0"
-		exists su && exec su -c "$0"
+		exe="$EXEDIR/$(basename "$0")"
+		exists sudo && exec sudo "$exe"
+		exists su && exec su root -c "$exe"
 		echo su or sudo not found
 		exitp 2
 	}

diff --git a/uninstall_easy.sh b/uninstall_easy.sh
@@ -33,11 +33,13 @@ exitp()
 
 require_root()
 {
+	local exe
 	echo \* checking privileges
 	[ $(id -u) -ne "0" ] && {
 		echo root is required
-		exists sudo && exec sudo "$0"
-		exists su && exec su -c "$0"
+		exe="$EXEDIR/$(basename "$0")"
+		exists sudo && exec sudo "$exe"
+		exists su && exec su root -c "$exe"
 		echo su or sudo not found
 		exitp 2
 	}