Changeset 19234 in josm

Timestamp:

2024-10-07T13:36:26+02:00 (12 hours ago)

Author:

taylor.smock

Message:

Fix #23951: Fix free in startup linux scripts when it is in a localized environment

Location:

trunk/native/linux

Files:

• latest/usr/bin/josm-latest (modified) (1 diff)
• tested/usr/bin/josm (modified) (1 diff)

trunk/native/linux/latest/usr/bin/josm-latest

@@ -59 +59 @@
 
 # If there is more than 8G ram, we can use up to 75% of the memory while still leaving 2G for other things.
-if [ "$(free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
+if [ "$(LC_ALL=C LANG=C free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
     # But don't set anything if JAVA_OPTS is already set.
     JAVA_OPTS="${JAVA_OPTS:=-XX:MaxRAMPercentage=75.0 -Xms256m}"

trunk/native/linux/tested/usr/bin/josm

@@ -59 +59 @@
 
 # If there is more than 8G ram, we can use up to 75% of the memory while still leaving 2G for other things.
-if [ "$(free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
+if [ "$(LC_ALL=C LANG=C free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
     # But don't set anything if JAVA_OPTS is already set.
     JAVA_OPTS="${JAVA_OPTS:=-XX:MaxRAMPercentage=75.0 -Xms256m}"