Skip to content
Snippets Groups Projects
Commit e3ac4d7b authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Lint bash script using ShellCheck

parent e1923bac
Branches
No related tags found
No related merge requests found
...@@ -54,10 +54,10 @@ if ! [ -x "$PHPUNIT" ]; then ...@@ -54,10 +54,10 @@ if ! [ -x "$PHPUNIT" ]; then
fi fi
PHPUNIT_VERSION=$("$PHP" "$PHPUNIT" --version | cut -d" " -f2) PHPUNIT_VERSION=$("$PHP" "$PHPUNIT" --version | cut -d" " -f2)
PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1) PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1)
PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2) PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2)
if ! [ $PHPUNIT_MAJOR_VERSION -gt 3 -o \( $PHPUNIT_MAJOR_VERSION -eq 3 -a $PHPUNIT_MINOR_VERSION -ge 7 \) ]; then if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 3 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 3 -a "$PHPUNIT_MINOR_VERSION" -ge 7 \) ]; then
echo "phpunit version >= 3.7 required. Version found: $PHPUNIT_VERSION" >&2 echo "phpunit version >= 3.7 required. Version found: $PHPUNIT_VERSION" >&2
exit 4 exit 4
fi fi
...@@ -70,7 +70,7 @@ fi ...@@ -70,7 +70,7 @@ fi
if [ "$1" ]; then if [ "$1" ]; then
FOUND=0 FOUND=0
for DBCONFIG in $DBCONFIGS; do for DBCONFIG in $DBCONFIGS; do
if [ "$1" = $DBCONFIG ]; then if [ "$1" = "$DBCONFIG" ]; then
FOUND=1 FOUND=1
break break
fi fi
...@@ -90,7 +90,7 @@ fi ...@@ -90,7 +90,7 @@ fi
function cleanup_config { function cleanup_config {
if [ ! -z "$DOCKER_CONTAINER_ID" ]; then if [ ! -z "$DOCKER_CONTAINER_ID" ]; then
echo "Kill the docker $DOCKER_CONTAINER_ID" echo "Kill the docker $DOCKER_CONTAINER_ID"
docker rm -f $DOCKER_CONTAINER_ID docker rm -f "$DOCKER_CONTAINER_ID"
fi fi
cd "$BASEDIR" cd "$BASEDIR"
...@@ -132,15 +132,15 @@ function execute_tests { ...@@ -132,15 +132,15 @@ function execute_tests {
# drop database # drop database
if [ "$1" == "mysql" ] ; then if [ "$1" == "mysql" ] ; then
mysql -u $DATABASEUSER -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
fi fi
if [ "$1" == "pgsql" ] ; then if [ "$1" == "pgsql" ] ; then
dropdb -U $DATABASEUSER $DATABASENAME || true dropdb -U "$DATABASEUSER" "$DATABASENAME" || true
fi fi
if [ "$1" == "oci" ] ; then if [ "$1" == "oci" ] ; then
echo "Fire up the oracle docker" echo "Fire up the oracle docker"
DOCKER_CONTAINER_ID=`docker run -d deepdiver/docker-oracle-xe-11g` DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g)
DATABASEHOST=`docker inspect $DOCKER_CONTAINER_ID | grep IPAddress | cut -d '"' -f 4` DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4)
echo "Waiting 60 seconds for Oracle initialization ... " echo "Waiting 60 seconds for Oracle initialization ... "
sleep 60 sleep 60
...@@ -151,7 +151,7 @@ function execute_tests { ...@@ -151,7 +151,7 @@ function execute_tests {
# trigger installation # trigger installation
echo "Installing ...." echo "Installing ...."
"$PHP" ./occ maintenance:install --database=$1 --database-name=$DATABASENAME --database-host=$DATABASEHOST --database-user=$DATABASEUSER --database-pass=owncloud --database-table-prefix=oc_ --admin-user=$ADMINLOGIN --admin-pass=admin --data-dir=$DATADIR "$PHP" ./occ maintenance:install --database="$1" --database-name="$DATABASENAME" --database-host="$DATABASEHOST" --database-user="$DATABASEUSER" --database-pass=owncloud --database-table-prefix=oc_ --admin-user="$ADMINLOGIN" --admin-pass=admin --data-dir="$DATADIR"
#test execution #test execution
echo "Testing with $1 ..." echo "Testing with $1 ..."
...@@ -176,7 +176,7 @@ if [ -z "$1" ] ...@@ -176,7 +176,7 @@ if [ -z "$1" ]
then then
# run all known database configs # run all known database configs
for DBCONFIG in $DBCONFIGS; do for DBCONFIG in $DBCONFIGS; do
execute_tests $DBCONFIG execute_tests "$DBCONFIG"
done done
else else
FILENAME="$2" FILENAME="$2"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment