[activemq] branch main updated: AMQ-9338: Use setenv instead of env to avoid POSIX conflict

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/main by this push:
     new 4b532cb9e AMQ-9338: Use setenv instead of env to avoid POSIX conflict
     new 5983fa244 Merge pull request #1074 from jbonofre/AMQ-9338
4b532cb9e is described below

commit 4b532cb9ecaebf6e1f096145d462122ca76bddaf
Author: JB Onofré <j...@nanthrax.net>
AuthorDate: Mon Oct 16 11:34:05 2023 +0200

    AMQ-9338: Use setenv instead of env to avoid POSIX conflict
---
 assembly/src/main/descriptors/unix-bin.xml | 2 +-
 assembly/src/release/bin/activemq          | 6 +++---
 assembly/src/release/bin/{env => setenv}   | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assembly/src/main/descriptors/unix-bin.xml 
b/assembly/src/main/descriptors/unix-bin.xml
index 6d7ccbc7c..182e96dbc 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -112,7 +112,7 @@
       <directory>src/release</directory>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>bin/env</include>
+        <include>bin/setenv</include>
       </includes>
       <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>
diff --git a/assembly/src/release/bin/activemq 
b/assembly/src/release/bin/activemq
index aebc2a3a1..05af554c6 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -36,7 +36,7 @@
 # for additional commandline arguments
 #
 # System variables for this script, like ACTIVEMQ_OPTS and 
ACTIVEMQ_OPTS_MEMORY,
-# can be configured in 'env' script located in this directory.
+# can be configured in 'setenv' script located in this directory.
 #
 # For more information on configuring the script, see 
http://activemq.apache.org/unix-shell-script.html
 #
@@ -171,7 +171,7 @@ if ( basename $0 | grep "activemq-instance-" > 
/dev/null);then
   ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} 
$HOME/.activemqrc-instance-${INST}"
   echo "INFO: Using alternative activemq configuration files: 
$ACTIVEMQ_CONFIGS"
 else
-  ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc 
$ACTIVEMQ_HOME/bin/env"
+  ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc 
$ACTIVEMQ_HOME/bin/setenv"
 fi
 
 # load activemq configuration
@@ -667,7 +667,7 @@ Configuration of this script:
     The configuration of this script is read from the following files:
     $ACTIVEMQ_CONFIGS
     This script searches for the files in the listed order and reads the first 
available file.
-    Modify $ACTIVEMQ_BASE/bin/env or create a copy of that file on a suitable 
location.
+    Modify $ACTIVEMQ_BASE/bin/setenv or create a copy of that file on a 
suitable location.
     To use additional configurations for running multiple instances on the 
same operating system
     rename or symlink script to a name matching to 
activemq-instance-<INSTANCENAME>.
     This changes the configuration location to 
/etc/default/activemq-instance-<INSTANCENAME> and
diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/setenv
similarity index 100%
rename from assembly/src/release/bin/env
rename to assembly/src/release/bin/setenv