Skip to content

Commit

Permalink
Merge pull request #363 from PrestaShop/fixCopyDotEnv
Browse files Browse the repository at this point in the history
Fixed copy of dotenv files (for 9.0 versions) for Nightly
  • Loading branch information
Progi1984 authored Jan 25, 2024
2 parents 672f893 + b6c22d3 commit ff97be0
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion base/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.1-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.1-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.2-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.2-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.3-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.3-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.4-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/7.4-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.0-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.0-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.1-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.1-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.2-apache/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/images/8.2-fpm/config_files/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then

if [ -d /tmp/data-ps ]; then
# init if empty
cp -n -R -p /tmp/data-ps/prestashop/* /var/www/html
cp -n -R -T -p /tmp/data-ps/prestashop/ /var/www/html
fi

if [ -f /tmp/defines_custom.inc.php ]; then
Expand Down

0 comments on commit ff97be0

Please sign in to comment.