From b2438dde804811e3976a98e9aa4ef5f6af7653e2 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 9 Oct 2023 18:12:05 +0200
Subject: [PATCH] evomaintenance: upstream release 23.10.1

---
 CHANGELOG                                    |  2 +-
 roles/evomaintenance/files/evomaintenance.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0a81244..85567b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -74,7 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * base: dump-server-state.sh upstream release 23.06
 * evocheck: upstream release 23.06
 * base: add evobsd_alias_fwupdate variable and make kshrc file a template so we can set or not a fw_update alias to servers that need it
-* evomaintenance: upstream release 23.10
+* evomaintenance: upstream release 23.10.1
 
 ### Fixed
 
diff --git a/roles/evomaintenance/files/evomaintenance.sh b/roles/evomaintenance/files/evomaintenance.sh
index d3ea6de..3ddbdf7 100644
--- a/roles/evomaintenance/files/evomaintenance.sh
+++ b/roles/evomaintenance/files/evomaintenance.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION="23.10"
+VERSION="23.10.1"
 
 show_version() {
     cat <<END
@@ -122,8 +122,8 @@ get_now() {
 }
 
 get_user() {
-    if [ -n "${USER}" ]; then
-	    echo "${USER}"
+    if [ -n "${FORCE_USER}" ]; then
+	    echo "${FORCE_USER}"
     else
 	    logname
     fi
@@ -399,7 +399,7 @@ AUTO=${AUTO:-"0"}
 EVOCHECK=${EVOCHECK:-"0"}
 GIT_STATUS_MAX_LINES=${GIT_STATUS_MAX_LINES:-20}
 API_ENDPOINT=${API_ENDPOINT:-""}
-USER=${USER:-""}
+FORCE_USER=${FORCE_USER:-""}
 
 # initialize variables
 MESSAGE=""
@@ -481,12 +481,12 @@ while :; do
             # Deprecated, backward compatibility
             # author change as autosysadmin
             printf 'WARNING: "--autosysadmin" is deprecated, use "--user autosysadmin".\n' >&2
-            USER="autosysadmin"
+            FORCE_USER="autosysadmin"
             ;;
         -u|--user)
             # user options, with value speparated by space
             if [ -n "$2" ]; then
-                USER=$2
+                FORCE_USER=$2
                 shift
             else
                 printf 'ERROR: "--user" requires a non-empty option argument.\n' >&2
@@ -495,7 +495,7 @@ while :; do
             ;;
         --user=?*)
             # message options, with value speparated by =
-            USER=${1#*=}
+            FORCE_USER=${1#*=}
             ;;
         --user=)
             # message options, without value