diff --git a/init_root.sh b/init_root.sh
index 223664e..28a9895 100755
--- a/init_root.sh
+++ b/init_root.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 scriptdir=$(dirname $(realpath $0))
-tempdir="/tmp"
+tempdir=$(mktemp -d)
 
 if [[ $EUID -ne 0 ]]; then
     echo "This script must be run as root."
diff --git a/init_sudo.sh b/init_sudo.sh
index faec0e6..015f592 100755
--- a/init_sudo.sh
+++ b/init_sudo.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 scriptdir=$(dirname $(realpath $0))
-tempdir="/tmp"
+tempdir=$(mktemp -d)
 
 if [[ $EUID -eq 0 ]]; then
     echo "This script should not be run as root."
     exit 1
 fi
 
-if ! sudo -v; then
+if [[ $(sudo whoami) != "root" ]]; then
     echo "Please get sudo access first."
     exit 1
 fi
diff --git a/run.sh b/run.sh
index 7ccf68c..5ce6569 100755
--- a/run.sh
+++ b/run.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
 scriptdir=$(dirname $(realpath $0))
-tempdir="/tmp"
 
 # ============================================================
 
 if [[ $EUID -eq 0 ]]; then
     echo "Running in root mode."
     sh $scriptdir/init_root.sh
-elif sudo -v; then
+elif [[ $(sudo whoami) == "root" ]]; then
     echo "Running in sudo mode."
     sh $scriptdir/init_sudo.sh
 else