Skip to content

Commit 9594167

Browse files
jolelievrejolelievre
authored
Merge pull request #416 from Quetzacoalt91/update-reference-file-for-installed-shops
Update test checking a shop is already installed, because settings.inc.php is not created anymore on PS v9
2 parents 53f918c + 29452fb commit 9594167

19 files changed

Lines changed: 57 additions & 57 deletions

File tree

‎base/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.1-apache/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.1-fpm/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.2-apache/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.2-fpm/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.3-apache/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.3-fpm/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.4-apache/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/7.4-fpm/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

‎base/images/8.0-apache/config_files/docker_run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
# From now, stop at error
2323
set -e
2424

25-
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
25+
if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ ! -f ./install.lock ]; then
2626

2727
echo "\n* Setting up install lock file..."
2828
touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
113113
echo "\n* Setup completed, removing lock file..."
114114
rm ./install.lock
115115

116-
elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
116+
elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
117117

118118
echo "\n* Another setup is currently running..."
119119
sleep 10
120120
exit 42
121121

122-
elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
122+
elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
123123

124124
echo "\n* Shop seems setup but remaining install lock still present..."
125125
sleep 10

0 commit comments

Comments
 (0)