Skip to content

Commit

Permalink
Merge pull request #186 from PierreRambaud/fix/missing-braces
Browse files Browse the repository at this point in the history 
Missing braces before moving install and admin directories
  • Loading branch information
@PierreRambaud
PierreRambaud committed Oct 11, 2019
2 parents 4c41276 + c9dd541 commit 114e6ea
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions base/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/5-apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/5-fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/5.6-apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/5.6-fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7-apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7-fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7.0-apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7.0-fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7.1-apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7.1-fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7.2-apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/7.2-fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/apache/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down
4 changes: 2 additions & 2 deletions base/images/fpm/config_files/docker_run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
echo "\n* No pre-install script found, let's continue..."
fi

if [ $PS_FOLDER_INSTALL != "install" && -d /var/www/html/install ]; then
if [ $PS_FOLDER_INSTALL != "install" ] && [ -d /var/www/html/install ]; then
echo "\n* Renaming install folder as $PS_FOLDER_INSTALL ...";
mv /var/www/html/install /var/www/html/$PS_FOLDER_INSTALL/
fi

if [ $PS_FOLDER_ADMIN != "admin" && -d /var/www/html/admin ]; then
if [ $PS_FOLDER_ADMIN != "admin" ] && [ -d /var/www/html/admin ]; then
echo "\n* Renaming admin folder as $PS_FOLDER_ADMIN ...";
mv /var/www/html/admin /var/www/html/$PS_FOLDER_ADMIN/
fi
Expand Down

0 comments on commit 114e6ea

Please sign in to comment.