Fixed sudo check, added WSL check

gmjn-dvlp · Oct 21, 2022 · ea6fa1b · ea6fa1b
1 parent b9ed10f
commit ea6fa1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ubuntu-initial.sh b/ubuntu-initial.sh
@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -e
 fail () { echo $1 >&2; exit 1; }
-[[ $(id -u) = 0 ]] || [[ -z $SUDO_USER ]] || fail "Please run 'sudo $0'"
+if [[ $(id -u) -ne 0 ]] || [[ -z $SUDO_USER ]]; then
+    fail "Please run 'sudo $0'"
+fi
+if [[ $(grep -i Microsoft /proc/version) ]]; then
+    fail "Running on WSL, try running 'sudo ./ubuntu-wsl.sh'"
+fi
 
 [[ -z $NEWHOST ]] && read -e -p "Enter hostname to set: " NEWHOST
 [[ $NEWHOST = *.*.* ]] || fail "hostname must contain two '.'s"

diff --git a/ubuntu-wsl.sh b/ubuntu-wsl.sh
@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -e
 fail () { echo $1 >&2; exit 1; }
-[[ $(id -u) = 0 ]] || [[ -z $SUDO_USER ]] || fail "Please run 'sudo $0'"
+if [[ $(id -u) -ne 0 ]] || [[ -z $SUDO_USER ]]; then
+    fail "Please run 'sudo $0'"
+fi
+if ! [[ $(grep -i Microsoft /proc/version) ]]; then
+    fail "NOT running on WSL, try running 'sudo ./ubuntu-initial.sh'"
+fi
 
 echo 'Defaults        timestamp_timeout=3600' >> /etc/sudoers