From 2cb322091c69b485388770602d7c1ad9a7f28c1e Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Fri, 13 May 2022 03:51:58 -0400
Subject: [PATCH] Look for and run the correct executable name.

---
 docker/finetestserver.rc                      |  1 +
 docker/lmk.devuan-chimaera.sh                 | 83 +++++++++++++------
 .../build-and-check.sh                        |  2 +-
 3 files changed, 59 insertions(+), 27 deletions(-)
 create mode 100644 docker/finetestserver.rc

diff --git a/docker/finetestserver.rc b/docker/finetestserver.rc
new file mode 100644
index 0000000..a8387e9
--- /dev/null
+++ b/docker/finetestserver.rc
@@ -0,0 +1 @@
+finetestserver_bin=/opt/linux-minetest-kit/minetest/bin/finetestserver
diff --git a/docker/lmk.devuan-chimaera.sh b/docker/lmk.devuan-chimaera.sh
index 9b17824..5bcad26 100755
--- a/docker/lmk.devuan-chimaera.sh
+++ b/docker/lmk.devuan-chimaera.sh
@@ -27,6 +27,8 @@ if [ ! -f "$this_rc" ]; then
 fi
 source $this_rc
 if [ $? -ne 0 ]; then exit 1; fi
+source finetestserver.rc
+if [ $? -ne 0 ]; then exit 1; fi
 if [ ! -d "$libraries_image_dir" ]; then
     echo "Error: $0 must run from the directory containing the container image directory: $libraries_image_dir"
     exit 1
@@ -139,37 +141,41 @@ END
 # ^ output is $container_name
 
 if [ "@$container_Id" != "@" ]; then
-    echo "* The container already appears to be set up."
-    exit 0
-fi
-echo "There is no container_Id for container_name=$container_name, so checking for image:"
-sudo docker image inspect $server_image --format "* docker is looking for the image..."
-if [ $? -ne 0 ]; then
-    echo "NOT FOUND, so:"
-    echo "* building $server_image ($server_image_dir inherits $libraries_image, so using built libraries from that should work)..."
-    if [ ! -d "$server_image_dir" ]; then
-        echo "Error: \"$server_image_dir\" doesn't exist in `pwd`."
-        exit 1
-    fi
-    sudo docker build -t $server_image $server_image_dir
-    # ^ ./mtcompile-program.pl --build --finetest --server returns 1 for some reason, so there is a custom build script used in the Dockerfile
-    # -t: Name and optionally a tag in the 'name:tag' format
+    echo "* The container already appears to be set up, so checking for the image will not be attempted."
+else
+    echo "There is no container_Id for container_name=$container_name, so checking for image:"
+    sudo docker image inspect $server_image --format "* docker is looking for the image..."
     if [ $? -ne 0 ]; then
-        exit 1
+        echo "NOT FOUND, so:"
+        echo "* building $server_image ($server_image_dir inherits $libraries_image, so using built libraries from that should work)..."
+        if [ ! -d "$server_image_dir" ]; then
+            echo "Error: \"$server_image_dir\" doesn't exist in `pwd`."
+            exit 1
+        fi
+        sudo docker build -t $server_image $server_image_dir
+        # ^ ./mtcompile-program.pl --build --finetest --server returns 1 for some reason, so there is a custom build script used in the Dockerfile
+        # -t: Name and optionally a tag in the 'name:tag' format
+        if [ $? -ne 0 ]; then
+            exit 1
+        fi
+    else
+        echo "* using existing $server_image"
     fi
-else
-    echo "* using existing $server_image"
 fi
 
 if [ "@$container_Id" = "@" ]; then
     # sudo docker run --name $container_name $libraries_image $run_all_build_commands_script
     # ^ build was moved to the Dockerfile
+    if [ "@$finetestserver_bin" = "@" ]; then
+        echo "Error: The image is not fully described since finetestserver_bin is blank. No container will be created."
+        exit 1
+    fi
     echo "* creating container $container_name from image $server_image"
-    sudo docker run --name $container_name $server_image /opt/linux-minetest-kit/minetest/minetestserver
+    sudo docker run --name $container_name $server_image $finetestserver_bin
     code=$?
     if [ $code -ne 0 ]; then
         cat <<END
-* building within the container FAILED
+* $finetestserver_bin FAILED
 
 - Remove the container as follows:
   sudo docker rm --force $container_name
@@ -179,17 +185,23 @@ if [ "@$container_Id" = "@" ]; then
   sudo docker image prune --force
   # --force: Don't prompt for confirmation.
 
-- Then try again:
+- Then you may try again:
   $0
 
+- However, first view errors and note the reason for the problem.
+  - If the program didn't complete startup view the startup error via:
+    sudo docker start $container_name --attach
+  - If the progam has an "ERROR[Main]" error, you need to edit
+    minetest.conf and then try the start subcommand above again.
+
 END
-        # exit $code
+        exit $code
     else
-        echo "* building within the container completed OK"
+        echo "* $finetestserver_bin completed OK"
     fi
 else
-    echo "* The container already appears to be set up."
-    exit 0
+    echo "* using existing container named $container_name with Id $container_Id."
+    # exit 0
 fi
 echo
 # echo "If the build output appeared successful, ignore the error above and create the minetest client image as follows:"
@@ -244,14 +256,21 @@ How to use the image:
 
   sudo docker ps -a
   # ^ List containers and show NAMES (The name is necessary for certain subcommands such as exec which operate on a running container).
+  # -a: Show all containers including stopped ones.
 
   sudo docker start $container_name
   # ^ Start a container. This will merely run $run_all_build_commands_script again since that is the container's main process.
 
+  sudo docker start $container_name --attach
+  # ^ Show messages while starting a container.
+
+  sudo docker logs $container_Id
+  # ^ Show logs for a container.
+
   sudo docker attach $container_name
   # ^ attach the current terminal to a running container.
 
-  sudo docker run $container_name
+  sudo docker run --name $container_name $server_image $finetestserver_bin
   # ^ "run" is merely a combination of "create" and "start"
 
   sudo docker -w $contained_repo exec $container_name ls -l $contained_repos
@@ -283,6 +302,18 @@ How to use the image:
   # ^ Delete a container by its name.
   # --force: kill and delete running containers as well.
 
+  sudo docker image inspect $libraries_image
+  sudo docker image inspect $server_image
+  # ^ Get JSON metadata for the image.
+
+  sudo docker container inspect $container_name
+  # ^ Get JSON metadata for the container.
+
+  - If the program didn't complete startup view the startup error via:
+    sudo docker start $container_name --attach
+  - If the progam has any "ERROR[Main]" error(s), you need to edit
+    minetest.conf and then try the start subcommand above again.
+
 END
 
 
diff --git a/docker/server-finetest-devuan-chimaera/build-and-check.sh b/docker/server-finetest-devuan-chimaera/build-and-check.sh
index 25b0ac3..de39c75 100755
--- a/docker/server-finetest-devuan-chimaera/build-and-check.sh
+++ b/docker/server-finetest-devuan-chimaera/build-and-check.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ./mtcompile-program.pl build --finetest --server
 echo "Done './mtcompile-program.pl build --finetest --server' (returned $?)"
-good_flag_file_name=multicraftserver
+good_flag_file_name=finetestserver
 good_flag_file=minetest/bin/$good_flag_file_name
 if [ -f "$good_flag_file" ]; then
     echo "* forcing OK return since found \"$good_flag_file\" in `pwd`"