Account for people with a single value set

Author: thespad

root/etc/cont-init.d/20-config

@@ -23,27 +23,51 @@ fi
 
 if grep -q "xmx" /config/data/system.properties && grep -q "xms" /config/data/system.properties; then
 
-  if [[ -n $MEM_LIMIT ]]; then
-      echo "*** Setting Java memory limit to $MEM_LIMIT ***"
-      sed -i "s/unifi.xmx=[0-9]\{1,5\}/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties 
-  fi
+    if [[ -n $MEM_LIMIT ]]; then
+        echo "*** Setting Java memory limit to $MEM_LIMIT ***"
+        sed -i "s/unifi.xmx=[0-9]\{1,5\}/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties 
+    fi
 
-  if [[ -n $MEM_STARTUP ]]; then
-      echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
-      sed -i "s/unifi.xms=[0-9]\{1,5\}/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
-  fi
+    if [[ -n $MEM_STARTUP ]]; then
+        echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
+        sed -i "s/unifi.xms=[0-9]\{1,5\}/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
+    fi
+
+elif grep -q "xmx" /config/data/system.properties; then
+
+    if [[ -n $MEM_LIMIT ]]; then
+        echo "*** Setting Java memory limit to $MEM_LIMIT ***"
+        sed -i "s/unifi.xmx=[0-9]\{1,5\}/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties 
+    fi
+
+    if [[ -n $MEM_STARTUP ]]; then
+        echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
+        echo "unifi.xms=$MEM_STARTUP" >> /config/data/system.properties
+    fi
+
+elif grep -q "xms" /config/data/system.properties; then
+
+    if [[ -n $MEM_STARTUP ]]; then
+        echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
+        sed -i "s/unifi.xms=[0-9]\{1,5\}/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
+    fi
+
+    if [[ -n $MEM_LIMIT ]]; then
+        echo "*** Setting Java memory limit to $MEM_LIMIT ***"
+        echo "unifi.xmx=$MEM_LIMIT" >> /config/data/system.properties 
+    fi
 
 else
 
-  if [[ -n $MEM_LIMIT ]]; then
-      echo "*** Setting Java memory limit to $MEM_LIMIT ***"
-      echo "unifi.xmx=$MEM_LIMIT" >> /config/data/system.properties 
-  fi
+    if [[ -n $MEM_LIMIT ]]; then
+        echo "*** Setting Java memory limit to $MEM_LIMIT ***"
+        echo "unifi.xmx=$MEM_LIMIT" >> /config/data/system.properties 
+    fi
 
-  if [[ -n $MEM_STARTUP ]]; then
-      echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
-      echo "unifi.xms=$MEM_STARTUP" >> /config/data/system.properties
-  fi
+    if [[ -n $MEM_STARTUP ]]; then
+        echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
+        echo "unifi.xms=$MEM_STARTUP" >> /config/data/system.properties
+    fi
 
 fi