Merge pull request #26 from Automattic/fix/mailpit-sc

fix(mailpit): Fix issues found by ShellCheck
Automattic · Apr 11, 2023 · b3dd39d · b3dd39d
2 parents d6bc96b + db6c796
commit b3dd39d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/features/src/mailpit/devcontainer-feature.json b/features/src/mailpit/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "mailpit",
     "name": "Mailpit",
     "description": "Sets up Mailpit into the Dev Environment",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "options": {
         "enabled": {
             "type": "boolean",

diff --git a/features/src/mailpit/install.sh b/features/src/mailpit/install.sh
@@ -4,7 +4,7 @@ set -e
 
 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 
-if [ "$(id -u)" -ne 0 ]; then
+if [ "$(id -u || true)" -ne 0 ]; then
     echo 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
@@ -15,6 +15,8 @@ else
     MAILPIT_USER="${_REMOTE_USER}"
 fi
 
+: "${ENABLED:=}"
+
 if [ "${ENABLED}" = "true" ]; then
     echo '(*) Installing MailHog...'