From 5dd0ba765a80a5b7d7ffb79f6a53df9702f54469 Mon Sep 17 00:00:00 2001
From: Marko <marbar3778@yahoo.com>
Date: Thu, 16 Nov 2023 15:43:00 +0100
Subject: [PATCH 1/3] docs: avoid copying non existent files & counter readme
 (#18487)

(cherry picked from commit 7a28425874a7f3afd2844e7a99f270b7809a05d4)

# Conflicts:
#	docs/pre.sh
---
 docs/pre.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/pre.sh b/docs/pre.sh
index 1db9268e8ca0..3d1a9aa39332 100755
--- a/docs/pre.sh
+++ b/docs/pre.sh
@@ -3,9 +3,23 @@
 ## Create modules pages
 for D in ../x/*; do
   if [ -d "${D}" ]; then
+<<<<<<< HEAD
     MODDOC=docs/build/modules/$(echo $D | awk -F/ '{print $NF}')
     rm -rf $MODDOC
     mkdir -p $MODDOC && cp -r $D/README.md "$_"
+=======
+    DIR_NAME=$(basename "$D")
+    
+    # Skip specific directories
+    if [[ "$DIR_NAME" != "counter" ]]; then
+      MODULE_DIRECTORY=build/modules/$DIR_NAME
+      rm -rf "$MODULE_DIRECTORY"
+      mkdir -p "$MODULE_DIRECTORY" 
+      if [ -f "$D"/README.md ]; then
+        cp -r "$D"/README.md "$MODULE_DIRECTORY"
+      fi
+    fi
+>>>>>>> 7a2842587 (docs: avoid copying non existent files & counter readme (#18487))
   fi
 done
 

From 8c489959693cdf7805c830b4dbd01317acee86aa Mon Sep 17 00:00:00 2001
From: marbar3778 <marbar3778@yahoo.com>
Date: Thu, 16 Nov 2023 15:53:08 +0100
Subject: [PATCH 2/3] attempt

---
 docs/pre.sh | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/docs/pre.sh b/docs/pre.sh
index 3d1a9aa39332..065f906f23fe 100755
--- a/docs/pre.sh
+++ b/docs/pre.sh
@@ -3,23 +3,13 @@
 ## Create modules pages
 for D in ../x/*; do
   if [ -d "${D}" ]; then
-<<<<<<< HEAD
-    MODDOC=docs/build/modules/$(echo $D | awk -F/ '{print $NF}')
-    rm -rf $MODDOC
-    mkdir -p $MODDOC && cp -r $D/README.md "$_"
-=======
-    DIR_NAME=$(basename "$D")
-    
     # Skip specific directories
-    if [[ "$DIR_NAME" != "counter" ]]; then
-      MODULE_DIRECTORY=build/modules/$DIR_NAME
-      rm -rf "$MODULE_DIRECTORY"
-      mkdir -p "$MODULE_DIRECTORY" 
-      if [ -f "$D"/README.md ]; then
-        cp -r "$D"/README.md "$MODULE_DIRECTORY"
-      fi
+    MODULE_DIRECTORY=docs/build/modules/$DIR_NAME
+    rm -rf "$MODULE_DIRECTORY"
+    mkdir -p "$MODULE_DIRECTORY" 
+    if [ -f "$D"/README.md ]; then
+      cp -r "$D"/README.md "$MODULE_DIRECTORY"
     fi
->>>>>>> 7a2842587 (docs: avoid copying non existent files & counter readme (#18487))
   fi
 done
 

From de9fb2063c73df8fb4d9058852d78856996d8cc3 Mon Sep 17 00:00:00 2001
From: marbar3778 <marbar3778@yahoo.com>
Date: Thu, 16 Nov 2023 15:53:33 +0100
Subject: [PATCH 3/3] remove comment

---
 docs/pre.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/pre.sh b/docs/pre.sh
index 065f906f23fe..42ae679f975a 100755
--- a/docs/pre.sh
+++ b/docs/pre.sh
@@ -3,7 +3,6 @@
 ## Create modules pages
 for D in ../x/*; do
   if [ -d "${D}" ]; then
-    # Skip specific directories
     MODULE_DIRECTORY=docs/build/modules/$DIR_NAME
     rm -rf "$MODULE_DIRECTORY"
     mkdir -p "$MODULE_DIRECTORY"