Merge pull request #9 from jiriks74/add_self-update_override

Add self update override

launch.cfg

@@ -33,7 +33,15 @@ mem="6000M"
 # Overrides #
 #############
 
-# Shouldn't be needed, but if for whatever reason you want to override some things, use the below options
+# Flags for the server itself
+# Usefull fot setting rcon password, server port, etc.
+mc_launchoptions="-nogui"
+
+# If you want to get rid of script updates notifications, set the below to false
+check_for_script_updates=true
+
+# The options below are for advanced users, modification is not needed in most cases
+# ----------------------------------------------------------------------------------
 
 # If you're purposefully using a different version of Java, you can override the version check
 java_version_override=false
@@ -44,5 +52,3 @@ java_version_override=false
 override_java_flags=false
 java_launchoptions=""
 
-# Flags for the server itself
-mc_launchoptions="-nogui"

start.sh

@@ -97,6 +97,7 @@ function check_java {
   # Check if the correct version of java is installed
   if (( 8 <= minecraft_middle && minecraft_middle <= 11 )); then
     if ! [[ $java_version -eq 8 ]]; then
+      echo "Java $java_version is installed."
       echo "Java 8 is required for Minecraft version $select_version. Please install Java 8."
       if [[ $java_version == 0 ]]; then
         exit 3
@@ -105,14 +106,16 @@ function check_java {
     fi
   elif (( 12 <= minecraft_middle && minecraft_middle <= 16 )); then
     if ! [[ $java_version -eq 11 ]]; then
+      echo "Java $java_version is installed."
+      echo "Java 11 is required for Minecraft version $select_version. Please install Java 11."
       if [[ $java_version == 0 ]]; then
         exit 3
       fi
-      echo "Java 11 is required for Minecraft version $select_version. Please install Java 11."
       ask_continue
     fi
   elif (( minecraft_middle == 17 )); then
     if ! [[ $java_version -eq 16 ]]; then
+      echo "Java $java_version is installed."
       echo "Java 16 is required for Minecraft version $select_version. Please install Java 16."
       if [[ $java_version == 0 ]]; then
         exit 3
@@ -121,6 +124,7 @@ function check_java {
     fi
   elif (( 18 <= minecraft_middle )); then
     if ! [[ $java_version -eq 17 ]]; then
+      echo "Java $java_version is installed."
       echo "Java 17 is required for Minecraft version $select_version. Please install Java 17."
       if [[ $java_version == 0 ]]; then
         exit 3
@@ -478,12 +482,16 @@ function load_config {
 function main {
   # Check dependencies
   check_dependencies
-
-  # Check for script updates
-  check_self_update
-
+  
   # Load config
   load_config
+  
+  if [[ $check_self_update == true ]]; then
+    # Check for script updates
+    check_self_update
+  else
+    echo "Skipping script update check."
+  fi
 
   # Check if the version and build are valid
   check_version_valid