From 0ebfa8adfdb5d995451271240f47c5128f7f1db7 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 24 Jan 2024 14:31:16 +0100
Subject: [PATCH] Fixed copy of dotenv files (for 9.0 versions)

---
 base/config_files/ps-extractor.sh                   | 2 +-
 base/images/7.1-apache/config_files/ps-extractor.sh | 2 +-
 base/images/7.1-fpm/config_files/ps-extractor.sh    | 2 +-
 base/images/7.2-apache/config_files/ps-extractor.sh | 2 +-
 base/images/7.2-fpm/config_files/ps-extractor.sh    | 2 +-
 base/images/7.3-apache/config_files/ps-extractor.sh | 2 +-
 base/images/7.3-fpm/config_files/ps-extractor.sh    | 2 +-
 base/images/7.4-apache/config_files/ps-extractor.sh | 2 +-
 base/images/7.4-fpm/config_files/ps-extractor.sh    | 2 +-
 base/images/8.0-apache/config_files/ps-extractor.sh | 2 +-
 base/images/8.0-fpm/config_files/ps-extractor.sh    | 2 +-
 base/images/8.1-apache/config_files/ps-extractor.sh | 2 +-
 base/images/8.1-fpm/config_files/ps-extractor.sh    | 2 +-
 base/images/8.2-apache/config_files/ps-extractor.sh | 2 +-
 base/images/8.2-fpm/config_files/ps-extractor.sh    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/base/config_files/ps-extractor.sh b/base/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/config_files/ps-extractor.sh
+++ b/base/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.1-apache/config_files/ps-extractor.sh b/base/images/7.1-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.1-apache/config_files/ps-extractor.sh
+++ b/base/images/7.1-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.1-fpm/config_files/ps-extractor.sh b/base/images/7.1-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.1-fpm/config_files/ps-extractor.sh
+++ b/base/images/7.1-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.2-apache/config_files/ps-extractor.sh b/base/images/7.2-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.2-apache/config_files/ps-extractor.sh
+++ b/base/images/7.2-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.2-fpm/config_files/ps-extractor.sh b/base/images/7.2-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.2-fpm/config_files/ps-extractor.sh
+++ b/base/images/7.2-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.3-apache/config_files/ps-extractor.sh b/base/images/7.3-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.3-apache/config_files/ps-extractor.sh
+++ b/base/images/7.3-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.3-fpm/config_files/ps-extractor.sh b/base/images/7.3-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.3-fpm/config_files/ps-extractor.sh
+++ b/base/images/7.3-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.4-apache/config_files/ps-extractor.sh b/base/images/7.4-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.4-apache/config_files/ps-extractor.sh
+++ b/base/images/7.4-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/7.4-fpm/config_files/ps-extractor.sh b/base/images/7.4-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/7.4-fpm/config_files/ps-extractor.sh
+++ b/base/images/7.4-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/8.0-apache/config_files/ps-extractor.sh b/base/images/8.0-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/8.0-apache/config_files/ps-extractor.sh
+++ b/base/images/8.0-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/8.0-fpm/config_files/ps-extractor.sh b/base/images/8.0-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/8.0-fpm/config_files/ps-extractor.sh
+++ b/base/images/8.0-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/8.1-apache/config_files/ps-extractor.sh b/base/images/8.1-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/8.1-apache/config_files/ps-extractor.sh
+++ b/base/images/8.1-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/8.1-fpm/config_files/ps-extractor.sh b/base/images/8.1-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/8.1-fpm/config_files/ps-extractor.sh
+++ b/base/images/8.1-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/8.2-apache/config_files/ps-extractor.sh b/base/images/8.2-apache/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/8.2-apache/config_files/ps-extractor.sh
+++ b/base/images/8.2-apache/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi
diff --git a/base/images/8.2-fpm/config_files/ps-extractor.sh b/base/images/8.2-fpm/config_files/ps-extractor.sh
index edeee96f..2c232fcb 100644
--- a/base/images/8.2-fpm/config_files/ps-extractor.sh
+++ b/base/images/8.2-fpm/config_files/ps-extractor.sh
@@ -11,7 +11,7 @@ if [[ -n "$folder" ]]; then
     fi
 
     chown www-data:www-data -R $folder/prestashop/
-    cp -n -R -p $folder/prestashop/* /var/www/html
+    cp -n -R -T -p $folder/prestashop/ /var/www/html
 else
     echo "Missing folder to move"
 fi