Remove OPT from some variables
This commit is contained in:
parent
916d7d4043
commit
108767c3d4
1 changed files with 10 additions and 10 deletions
20
mca.sh
20
mca.sh
|
|
@ -120,11 +120,11 @@ if [ "$CONFIGURE_ONLY" -eq 0 ]; then
|
||||||
echo "$EXEC_NAME: $SCREEN_NAME: no such screen found" >&2
|
echo "$EXEC_NAME: $SCREEN_NAME: no such screen found" >&2
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -d "$MCA_DIR" ]; then
|
if [ ! -d "$MCA_DIR" ]; then
|
||||||
echo "$EXEC_NAME: $MCA_DIR: such directory not found" >&2
|
echo "$EXEC_NAME: $MCA_DIR: such directory not found" >&2
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd "$MCA_DIR"
|
cd "$MCA_DIR"
|
||||||
|
|
@ -240,8 +240,8 @@ if [ "$CONFIGURE_ONLY" -eq 0 ]; then
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -n "$MCA_OPT_JAVA_HOME" ] && [ -d "$MCA_OPT_JAVA_HOME/bin" ]; then
|
if [ -n "$MCA_JAVA_HOME" ] && [ -d "$MCA_JAVA_HOME/bin" ]; then
|
||||||
PATH="$MCA_OPT_JAVA_HOME/bin:$PATH"
|
PATH="$MCA_JAVA_HOME/bin:$PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v java > /dev/null; then
|
if ! command -v java > /dev/null; then
|
||||||
|
|
@ -249,10 +249,10 @@ if [ "$CONFIGURE_ONLY" -eq 0 ]; then
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -n "$MCA_OPT_MAX_MEMORY" ] \
|
[ -n "$MCA_MAX_MEMORY" ] \
|
||||||
&& MCA_JVM_FLAGS="-Xmx$MCA_OPT_MAX_MEMORY $MCA_JVM_FLAGS"
|
&& MCA_JVM_FLAGS="-Xmx$MCA_MAX_MEMORY $MCA_JVM_FLAGS"
|
||||||
[ -n "$MCA_OPT_MIN_MEMORY" ] \
|
[ -n "$MCA_MIN_MEMORY" ] \
|
||||||
&& MCA_JVM_FLAGS="-Xms$MCA_OPT_MIN_MEMORY $MCA_JVM_FLAGS"
|
&& MCA_JVM_FLAGS="-Xms$MCA_MIN_MEMORY $MCA_JVM_FLAGS"
|
||||||
|
|
||||||
SCREEN_CMD="$(which java) -server $MCA_JVM_FLAGS -jar $MCA_JAR"
|
SCREEN_CMD="$(which java) -server $MCA_JVM_FLAGS -jar $MCA_JAR"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue