Skip to content

Commit 0c1618a

Browse files
Copilotlvca
andauthored
Fix shell script parameter duplication and improve consistency (#2622)
* Initial plan * Fix shell script parameter duplication and improve consistency - server.sh: Remove duplicate argument expansion ($* and "$@") - console.sh: Add ARCADEDB_OPTS_MEMORY initialization for consistency - restore.sh: Fix ARCADEDB_HOME check (console.sh -> restore.sh) - restore.sh: Add ARCADEDB_OPTS_MEMORY initialization - restore.sh: Fix argument expansion ($* -> "$@") Co-authored-by: lvca <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: lvca <[email protected]>
1 parent fd8a2c9 commit 0c1618a

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

package/src/main/scripts/console.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ else
4646
JAVA=java
4747
fi
4848

49+
# ARCADEDB memory options, default uses the available RAM. To set it to a specific value, like 2GB of heap, use "-Xms2G -Xmx2G"
50+
if [ -z "$ARCADEDB_OPTS_MEMORY" ]; then
51+
ARCADEDB_OPTS_MEMORY=""
52+
fi
4953

5054
if [ -z "$JAVA_OPTS_SCRIPT" ] ; then
5155
JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError \

package/src/main/scripts/restore.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ done
3232
PRGDIR=`dirname "$PRG"`
3333

3434
# Only set ARCADEDB_HOME if not already set
35-
[ -f "$ARCADEDB_HOME"/bin/console.sh ] || ARCADEDB_HOME=`cd "$PRGDIR/.." ; pwd`
35+
[ -f "$ARCADEDB_HOME"/bin/restore.sh ] || ARCADEDB_HOME=`cd "$PRGDIR/.." ; pwd`
3636

3737
# Raspberry Pi check (Java VM does not run with -server argument on ARMv6)
3838
if [ `uname -m` != "armv6l" ]; then
@@ -46,6 +46,11 @@ else
4646
JAVA=java
4747
fi
4848

49+
# ARCADEDB memory options, default uses the available RAM. To set it to a specific value, like 2GB of heap, use "-Xms2G -Xmx2G"
50+
if [ -z "$ARCADEDB_OPTS_MEMORY" ]; then
51+
ARCADEDB_OPTS_MEMORY=""
52+
fi
53+
4954
if [ -z "$JAVA_OPTS_SCRIPT" ] ; then
5055
JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError \
5156
--add-exports java.management/sun.management=ALL-UNNAMED \
@@ -62,4 +67,4 @@ exec "$JAVA" $JAVA_OPTS \
6267
$JAVA_OPTS_SCRIPT \
6368
$ARCADEDB_SETTINGS \
6469
-cp "$ARCADEDB_HOME/lib/*" \
65-
$ARGS com.arcadedb.integration.restore.Restore $*
70+
$ARGS com.arcadedb.integration.restore.Restore "$@"

package/src/main/scripts/server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ exec "$JAVA" $JAVA_OPTS \
100100
$ARCADEDB_JMX \
101101
$ARCADEDB_SETTINGS \
102102
-cp "$ARCADEDB_HOME/lib/*" \
103-
$ARGS $* "$@" com.arcadedb.server.ArcadeDBServer
103+
$ARGS "$@" com.arcadedb.server.ArcadeDBServer

0 commit comments

Comments
 (0)