From: Fred Hamster <fred@gruntose.com>
Date: Mon, 16 Dec 2024 21:12:31 +0000 (-0500)
Subject: fixed some recursion
X-Git-Tag: 2.140.189^2~71
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9334926a84655c3c6cf8f50f60db94b8b7601e06;p=feisty_meow.git

fixed some recursion
---

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index c1791c59..4593266a 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -122,7 +122,11 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
   #####
 
   # patch the user variable if we were launched by one of our cron jobs.
-  USER="$(sanitized_username)"
+  # first we set USER to not use the full email style version, if that's what already exists.
+  if [ ! -z "$USER" -a ! -z "$(echo "${USER/.*@.*/yeps}")" ]; then
+    USER="$(sanitized_username)"
+  fi
+  # then we check if the USER variable isn't set, and use CRONUSER from the cron templates, if defined.
   if [ -z "$USER" -a ! -z "$CRONUSER" ]; then
     export USER="$CRONUSER"
   fi