From 47da0ab1aa3e770dea88a07d0be61ca34dcd77dd Mon Sep 17 00:00:00 2001
From: Iain Powrie <zedifus@zediverse.gg>
Date: Fri, 10 Jun 2022 23:30:33 +0000
Subject: [PATCH] Wrapper optimisation

---
 docker_launcher.sh | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/docker_launcher.sh b/docker_launcher.sh
index 3a14a2d0..0237b75f 100644
--- a/docker_launcher.sh
+++ b/docker_launcher.sh
@@ -1,31 +1,44 @@
 #!/bin/sh
 
-# Check if config exists from existing installation (venv or previous docker launch)
+# Check if config exists taking one from image if needed.
 if [ ! "$(ls -A --ignore=.gitkeep ./app/config)" ]; then
-    echo "Wrapper | Config not found, pulling defaults..."
+    echo "Wrapper | 🏗️ Config not found, pulling defaults..."
     mkdir ./app/config/ 2> /dev/null
     cp -r ./app/config_original/* ./app/config/
+
+    if [ $(id -u) -eq 0 ]; then
+        # We're running as root;
+        # Look for files & dirs that require group permissions to be fixed
+        # This will do the full /crafty dir, so will take a miniute.
+        echo "Wrapper | 📋 Looking for problem bind mount permissions globally..."
+        find . ! -group root -exec chgrp root {} \;
+        find . ! -perm g+rw -exec chmod g+rw {} \;
+        find . -type d ! -perm g+s -exec chmod g+s {} \;
+    fi
 fi
 
 
 if [ $(id -u) -eq 0 ]; then
-    # We're running as root;
-    # Need to ensure all dirs are owned by the root group,
-    # This fixes bind mounts that may have incorrect perms.
+    # We're running as root
 
-    # Look for files & dirs that require group permissions to be fixed
-    echo "Wrapper | Looking for problem bind mount permissions"
-    find . ! -group root -exec chgrp root {} \;
-    find . ! -perm g+rw -exec chmod g+rw {} \;
-    find . -type d ! -perm g+s -exec chmod g+s {} \;
+    # If we find files in import directory, we need to ensure all dirs are owned by the root group,
+    # This fixes bind mounts that may have incorrect perms.
+    if [ ! "$(ls -A --ignore=.gitkeep ./app/import)" ]; then
+        echo "Wrapper | 📋 Files present in import, checking/fixing permissions..."
+        echo "Wrapper | ⏳ Please be paitent for larger servers..."
+        find . ! -group root -exec chgrp root {} \;
+        find . ! -perm g+rw -exec chmod g+rw {} \;
+        find . -type d ! -perm g+s -exec chmod g+s {} \;
+        echo "Wrapper | ✅ Permissions Fixed! (This will happen every boot until /import is empty!)"
+    fi
 
     # Switch user, activate our prepared venv and lauch crafty
     args="$@"
-    echo "Wrapper | Launching crafty with [$args]"
+    echo "Wrapper | 🚀 Launching crafty with [$args]"
     exec sudo -u crafty bash -c "source ./.venv/bin/activate && exec python3 main.py $args"
 else
     # Activate our prepared venv
-    echo "Wrapper | Non-root host detected, using normal exec"
+    echo "Wrapper | 🚀 Non-root host detected, using normal exec"
     . ./.venv/bin/activate
     # Use exec as our perms are already correct
     # This is likely if using Kubernetes/OpenShift etc