Compare commits
2 Commits
73d49d00c8
...
6d9b10886a
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d9b10886a | |||
| 95a21c19bb |
@ -94,9 +94,13 @@ elif [[ "$maxRam" =~ ("G"|"M") ]]; then
|
||||
printf "\n+ Allocating $maxRam as RAM maximum."
|
||||
echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt
|
||||
elif [[ -z $maxRam ]]; then
|
||||
$maxRam="4G"
|
||||
<<<<<<< HEAD
|
||||
printf "\n+ Allocating $MaxRam as RAM maximum"
|
||||
echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt
|
||||
echo "-Xmx4G" >> user_jvm_args.txt
|
||||
=======
|
||||
printf "\n+ Allocating $MaxRam as RAM maximum"
|
||||
echo "-Xmx4G" >> /opt/minecraft/user_jvm_args.txt
|
||||
>>>>>>> refs/remotes/origin/life2
|
||||
elif [[ ! "$maxRam" =~ ("G"|"MB") ]]; then
|
||||
printf "\n+ Allocating ${maxRam}G as RAM maximum"
|
||||
echo "-Xmx${maxRam}G" >> /opt/minecraft/user_jvm_args.txt
|
||||
@ -113,9 +117,13 @@ elif [[ "$minRam" =~ ("G"|"M") ]]; then
|
||||
printf "\n+ Allocating $minRam as RAM minimum."
|
||||
echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt
|
||||
elif [[ -z $minRam ]]; then
|
||||
$minRam="1G"
|
||||
<<<<<<< HEAD
|
||||
printf "\n+ Allocating $minRam as RAM minimum"
|
||||
echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt
|
||||
echo "-Xms1G" >> user_jvm_args.txt
|
||||
=======
|
||||
printf "\n+ Allocating $minRam as RAM minimum"
|
||||
echo "-Xms1G" >> /opt/minecraft/user_jvm_args.txt
|
||||
>>>>>>> refs/remotes/origin/life2
|
||||
elif [[ ! "$minRam" =~ ("G"|"MB") ]]; then
|
||||
printf "Allocating ${minRam}G as RAM maximum"
|
||||
echo "-Xms${minRam}G" >> /opt/minecraft/user_jvm_args.txt
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user