From 91c5510bbf50f827bdfd922e387dfb3027b2c8ec Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Fri, 8 Jan 2021 17:00:59 +0100
Subject: [PATCH] IDEMPIERE-4634 idempiere service scripts still generating
 myEnvironment.sav as root (#513)

---
 .../utils.unix/unix/idempiere_Debian.sh                         | 2 ++
 .../utils.unix/unix/idempiere_RedHat.sh                         | 2 ++
 org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh
index 4e79190d8b..ab3834d70c 100644
--- a/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh
+++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh
@@ -46,6 +46,7 @@ start () {
     fi
     echo -n "Starting iDempiere ERP: "
     cd $IDEMPIERE_HOME/utils || exit
+    export ID_ENV=Server
     . $ENVFILE
     export LOGFILE=$IDEMPIERE_HOME/log/idempiere_$(date +%Y%m%d%H%M%S).log
     su $IDEMPIEREUSER -c "mkdir -p $IDEMPIERE_HOME/log"
@@ -88,6 +89,7 @@ stop () {
     fi
     echo -n "Stopping iDempiere ERP: "
     cd $IDEMPIERE_HOME/utils || exit
+    export ID_ENV=Server
     . $ENVFILE
     # try shutdown from OSGi console, then direct kill with signal 15, then signal 9
     log_warning_msg "Trying shutdown from OSGi console"
diff --git a/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh
index e0b25889f5..aad4d32ee6 100644
--- a/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh
+++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh
@@ -42,6 +42,7 @@ start () {
     fi
     echo -n "Starting iDempiere ERP: "
     cd $IDEMPIERE_HOME/utils || exit
+    export ID_ENV=Server
     source $ENVFILE
     export LOGFILE=$IDEMPIERE_HOME/log/idempiere_$(date +%Y%m%d%H%M%S).log
     su $IDEMPIEREUSER -c "mkdir -p $IDEMPIERE_HOME/log"
@@ -84,6 +85,7 @@ stop () {
     fi
     echo -n "Stopping iDempiere ERP: "
     cd $IDEMPIERE_HOME/utils || exit
+    export ID_ENV=Server
     source $ENVFILE
     # try shutdown from OSGi console, then direct kill with signal 15, then signal 9
     echo "Trying shutdown from OSGi console"
diff --git a/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh
index 3293fda64e..33084af45b 100644
--- a/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh
+++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_Suse.sh
@@ -72,6 +72,7 @@ start () {
     fi
     echo -n "Starting iDempiere ERP: "
     cd $IDEMPIERE_HOME/utils || exit
+    export ID_ENV=Server
     . $ENVFILE
     export LOGFILE=$IDEMPIERE_HOME/log/idempiere_$(date +%Y%m%d%H%M%S).log
     su $IDEMPIEREUSER -c "mkdir -p $IDEMPIERE_HOME/log"
@@ -115,6 +116,7 @@ stop () {
     fi
     echo -n "Stopping iDempiere ERP: "
     cd $IDEMPIERE_HOME/utils || exit
+    export ID_ENV=Server
     . $ENVFILE
     # try shutdown from OSGi console, then direct kill with signal 15, then signal 9
     log_warning_msg "Trying shutdown from OSGi console"