From 6a7ebbb27e21e16bf4d57648eb4d454f3f9b5cd1 Mon Sep 17 00:00:00 2001 From: Jason House Date: Wed, 5 Jan 2022 20:01:12 -0500 Subject: [PATCH] Fixing start.sh to not show errors --- buildAlpha | 2 ++ pom.xml | 10 +--------- start.sh | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/buildAlpha b/buildAlpha index ebf1e41..028f2a6 100755 --- a/buildAlpha +++ b/buildAlpha @@ -1,6 +1,8 @@ #!/bin/bash set -e +npm ci ./minify +npm run test mvn clean install docker build -f Dockerfile -t "housewrecker/gaps:alpha" . docker push "housewrecker/gaps:alpha" \ No newline at end of file diff --git a/pom.xml b/pom.xml index 38ea9ee..3a5440e 100644 --- a/pom.xml +++ b/pom.xml @@ -251,15 +251,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.5.2 - - - - com.github.spotbugs - spotbugs - 4.5.2 - - + 4.5.2.0 diff --git a/start.sh b/start.sh index bc13a5f..4667fc0 100755 --- a/start.sh +++ b/start.sh @@ -3,14 +3,14 @@ echo "Enable SSL: $ENABLE_SSL" echo "Enable Login: $ENABLE_LOGIN" echo "Base URL: $BASE_URL" echo "Jar File: $JAR_FILE" -if [ $ENABLE_SSL == true ]; then - if [ $ENABLE_LOGIN == true ]; then +if [ "$ENABLE_SSL" = true ]; then + if [ "$ENABLE_LOGIN" = true ]; then java -Xms256m -Xmx2048m -jar -Dspring.profiles.active=ssl -Dserver.servlet.context-path=$BASE_URL $JAR_FILE else java -Xms256m -Xmx2048m -jar -Dspring.profiles.active=ssl-no-login -Dserver.servlet.context-path=$BASE_URL $JAR_FILE fi else - if [ $ENABLE_LOGIN == true ]; then + if [ "$ENABLE_LOGIN" = true ]; then java -Xms256m -Xmx2048m -jar -Dspring.profiles.active=no-ssl -Dserver.servlet.context-path=$BASE_URL $JAR_FILE else java -Xms256m -Xmx2048m -jar -Dspring.profiles.active=no-ssl-no-login -Dserver.servlet.context-path=$BASE_URL $JAR_FILE