mirror of https://github.com/apache/activemq.git
AMQ-9338: Use setenv instead of env to avoid POSIX conflict
This commit is contained in:
parent
294ec12594
commit
4b532cb9ec
|
@ -112,7 +112,7 @@
|
||||||
<directory>src/release</directory>
|
<directory>src/release</directory>
|
||||||
<outputDirectory></outputDirectory>
|
<outputDirectory></outputDirectory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>bin/env</include>
|
<include>bin/setenv</include>
|
||||||
</includes>
|
</includes>
|
||||||
<directoryMode>0755</directoryMode>
|
<directoryMode>0755</directoryMode>
|
||||||
<fileMode>0644</fileMode>
|
<fileMode>0644</fileMode>
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
# for additional commandline arguments
|
# for additional commandline arguments
|
||||||
#
|
#
|
||||||
# System variables for this script, like ACTIVEMQ_OPTS and ACTIVEMQ_OPTS_MEMORY,
|
# 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
|
# 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}"
|
ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
|
||||||
echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
|
echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
|
||||||
else
|
else
|
||||||
ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env"
|
ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc $ACTIVEMQ_HOME/bin/setenv"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# load activemq configuration
|
# load activemq configuration
|
||||||
|
@ -667,7 +667,7 @@ Configuration of this script:
|
||||||
The configuration of this script is read from the following files:
|
The configuration of this script is read from the following files:
|
||||||
$ACTIVEMQ_CONFIGS
|
$ACTIVEMQ_CONFIGS
|
||||||
This script searches for the files in the listed order and reads the first available file.
|
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
|
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>.
|
rename or symlink script to a name matching to activemq-instance-<INSTANCENAME>.
|
||||||
This changes the configuration location to /etc/default/activemq-instance-<INSTANCENAME> and
|
This changes the configuration location to /etc/default/activemq-instance-<INSTANCENAME> and
|
||||||
|
|
Loading…
Reference in New Issue