diff --git a/diagnose b/diagnose
index 0bf96e9bd..b073353c4 100755
--- a/diagnose
+++ b/diagnose
@@ -6,6 +6,10 @@
 cd "$(dirname "$0")";export base="$(pwd)"
 output_file=diagnose.result;rm $output_file
 export LANG=C;export LC_ALL=C
+case $(whoami) in
+  root)echo -e "\e[31m[$0]: This script is NOT to be executed with sudo or as root. Aborting...\e[0m";exit 1;;
+esac
+
 
 x() { ii_exec "$@" 2>&1 | tee -a $output_file ; }
 e() { ii_box "$@" | tee -a $output_file ; }
diff --git a/manual-install-helper.sh b/manual-install-helper.sh
index aabfd6943..663f3009a 100755
--- a/manual-install-helper.sh
+++ b/manual-install-helper.sh
@@ -5,19 +5,20 @@
 
 cd "$(dirname "$0")"
 export base="$(pwd)"
+source ./scriptdata/environment-variables
 source ./scriptdata/functions
 source ./scriptdata/installers
-source ./scriptdata/environment-variables
+prevent_sudo_or_root
 
 if command -v pacman >/dev/null 2>&1;then printf "\e[31m[$0]: pacman found, it seems that the system is ArchLinux or Arch-based distro. Aborting...\e[0m\n";exit 1;fi
-install-agsv1
-install-Rubik
-install-Gabarito
-install-OneUI
-install-bibata
-install-MicroTeX
-install-uv
-install-python-packages
+v install-agsv1
+v install-Rubik
+v install-Gabarito
+v install-OneUI
+v install-bibata
+v install-MicroTeX
+v install-uv
+v install-python-packages
 
 if [[ -z "${ILLOGICAL_IMPULSE_VIRTUAL_ENV}" ]]; then
   printf "\n\e[31m[$0]: \!! Important \!! : Please ensure environment variable \e[0m \$ILLOGICAL_IMPULSE_VIRTUAL_ENV \e[31m is set to proper value (by default \"~/.local/state/ags/.venv\"), or AGS config will not work. We have already provided this configuration in ~/.config/hypr/hyprland/env.conf, but you need to ensure it is included in hyprland.conf, and also a restart is needed for applying it.\e[0m\n"