From 7f2d7eb0388fe4063628710364a3bdaf62abe178 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Sat, 18 Sep 2021 07:20:34 -0400
Subject: [PATCH] Continue migration of user emails to IDs

---
 salt/common/tools/sbin/so-user | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index 40416860e..5fc1db66a 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -159,22 +159,22 @@ function createFile() {
 
 function ensureRoleFileExists() {
   if [ ! -s "$socRolesFile" ]; then
-    echo "Migrating roles to new file: $socRolesFile"
-
-    rolesTmpFile="${socRolesFile}.tmp"
-    createFile "$rolesTmpFile" "$soUID" "$soGID"
-
     if [[ -f "$databasePath" ]]; then
+      echo "Migrating roles to new file: $socRolesFile"
+
       # Generate the new users file
+      rolesTmpFile="${socRolesFile}.tmp"
+      createFile "$rolesTmpFile" "$soUID" "$soGID"
+
       echo "select 'superuser:' || id from identities;" | sqlite3 "$databasePath" \
         >> "$rolesTmpFile"
       [[ $? != 0 ]] && fail "Unable to read identities from database"
+
+      mv "${rolesTmpFile}" "${socRolesFile}"
     else
       echo "Database file does not exist yet, installation is likely not yet complete."
-      exit 1
+      exit 0
     fi
-
-    mv "${rolesTmpFile}" "${socRolesFile}"
   fi
 }