From acc5764565241b28e81d51a42760136804f732e9 Mon Sep 17 00:00:00 2001
From: trikimiki <41070061+trikimiki@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:31:18 +0200
Subject: [PATCH] rewrite volume check/create scripts add option to skip
 ownership change (fix for Docker Desktop "Synchronized file shares " feature)

---
 docker/compose-utils.sh             | 72 ++++++++++++++++++++++++-----
 docker/docker-check-log-folders.sh  |  9 +++-
 docker/docker-create-log-folders.sh |  2 +-
 3 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/docker/compose-utils.sh b/docker/compose-utils.sh
index d5e60bee7f..dd2d2890fc 100755
--- a/docker/compose-utils.sh
+++ b/docker/compose-utils.sh
@@ -182,29 +182,77 @@ function permissionList() {
 }
 
 function checkFolders() {
+  CREATE=false
+  SKIP_CHOWN=false
+  for i in "$@"
+    do
+      case $i in
+          --create)
+          CREATE=true
+          shift
+          ;;
+          --skipChown)
+          SKIP_CHOWN=true
+          shift
+          ;;
+          *)
+                  # unknown option
+          ;;
+      esac
+    done
   EXIT_CODE=0
   PERMISSION_LIST=$(permissionList) || exit $?
   set -e
   while read -r USR GRP DIR
   do
-    if [ -z "$DIR" ]; then # skip empty lines
+    IS_EXIST_CHECK_PASSED=false
+    IS_OWNER_CHECK_PASSED=false
+
+    # skip empty lines
+    if [ -z "$DIR" ]; then
           continue
     fi
-    MESSAGE="Checking user ${USR} group ${GRP} dir ${DIR}"
-    if [[ -d "$DIR" ]] &&
-       [[ $(ls -ldn "$DIR" | awk '{print $3}') -eq "$USR" ]] &&
-       [[ $(ls -ldn "$DIR" | awk '{print $4}') -eq "$GRP" ]]
-    then
-      MESSAGE="$MESSAGE OK"
+
+    # checks section
+    echo "Checking if dir ${DIR} exists..."
+    if [[ -d "$DIR" ]]; then
+      echo "> OK"
+      IS_EXIST_CHECK_PASSED=true
+      if [ "$SKIP_CHOWN" = false ]; then
+        echo "Checking user ${USR} group ${GRP} ownership for dir ${DIR}..."
+        if [[ $(ls -ldn "$DIR" | awk '{print $3}') -eq "$USR" ]] && [[ $(ls -ldn "$DIR" | awk '{print $4}') -eq "$GRP" ]]; then
+          echo "> OK"
+          IS_OWNER_CHECK_PASSED=true
+        else
+          echo "...ownership check failed"
+          if [ "$CREATE" = false ]; then
+            EXIT_CODE=1
+          fi
+        fi
+      fi
     else
-      if [ "$1" = "--create" ]; then
-        echo "Create and chown: user ${USR} group ${GRP} dir ${DIR}"
-        mkdir -p "$DIR" && sudo chown -R "$USR":"$GRP" "$DIR"
-      else
-        echo "$MESSAGE FAILED"
+      echo "...does not exist"
+      if [ "$CREATE" = false ]; then
         EXIT_CODE=1
       fi
     fi
+
+    # create/chown section
+    if [ "$CREATE" = true ]; then
+      if [ "$IS_EXIST_CHECK_PASSED" = false ]; then
+        echo "...will create dir ${DIR}"
+        if [ "$SKIP_CHOWN" = false ]; then
+        echo "...will change ownership to user ${USR} group ${GRP} for dir ${DIR}"
+          mkdir -p "$DIR" && sudo chown -R "$USR":"$GRP" "$DIR" && echo "> OK"
+        else
+          mkdir -p "$DIR" && echo "> OK"
+        fi
+      elif [ "$IS_OWNER_CHECK_PASSED" = false ] && [ "$SKIP_CHOWN" = false ]; then
+        echo "...will change ownership to user ${USR} group ${GRP} for dir ${DIR}"
+        sudo chown -R "$USR":"$GRP" "$DIR" && echo "> OK"
+      fi
+    fi
+
   done < <(echo "$PERMISSION_LIST")
   return $EXIT_CODE
 }
diff --git a/docker/docker-check-log-folders.sh b/docker/docker-check-log-folders.sh
index e293968a69..22e91ea3f3 100755
--- a/docker/docker-check-log-folders.sh
+++ b/docker/docker-check-log-folders.sh
@@ -17,5 +17,10 @@
 
 set -e
 source compose-utils.sh
-checkFolders || exit $?
-echo "OK"
+if checkFolders "$@" ; then
+    echo "------"
+    echo "All checks have passed"
+else
+    echo "------"
+    echo "Some checks did not pass - check the output"
+fi
\ No newline at end of file
diff --git a/docker/docker-create-log-folders.sh b/docker/docker-create-log-folders.sh
index 098ffabb31..ed66d4e156 100755
--- a/docker/docker-create-log-folders.sh
+++ b/docker/docker-create-log-folders.sh
@@ -17,4 +17,4 @@
 
 set -e
 source compose-utils.sh
-checkFolders --create
+checkFolders --create "$@"