diff --git a/entrypoint.sh b/entrypoint.sh index 7204a9d..486bd3a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,19 +11,19 @@ else SONAR_PASSWORD="" fi -if [[ -f "${INPUT_PROJECTBASEDIR%/}pom.xml" ]]; then +if [[ -f "${INPUT_PROJECTBASEDIR%/}/pom.xml" ]]; then echo "::error file=${INPUT_PROJECTBASEDIR%/}pom.xml::Maven project detected. You should run the goal 'org.sonarsource.scanner.maven:sonar' during build rather than using this GitHub Action." exit 1 fi -if [[ -f "${INPUT_PROJECTBASEDIR%/}build.gradle" ]]; then +if [[ -f "${INPUT_PROJECTBASEDIR%/}/build.gradle" ]]; then echo "::error file=${INPUT_PROJECTBASEDIR%/}build.gradle::Gradle project detected. You should use the SonarQube plugin for Gradle during build rather than using this GitHub Action." exit 1 fi unset JAVA_HOME -if [[ ! -f "${INPUT_PROJECTBASEDIR%/}sonar-project.properties" ]]; then +if [[ ! -f "${INPUT_PROJECTBASEDIR%/}/sonar-project.properties" ]]; then [[ -z "${INPUT_PROJECTKEY}" ]] && SONAR_PROJECTKEY="${REPOSITORY_NAME}" || SONAR_PROJECTKEY="${INPUT_PROJECTKEY}" [[ -z "${INPUT_PROJECTNAME}" ]] && SONAR_PROJECTNAME="${REPOSITORY_NAME}" || SONAR_PROJECTNAME="${INPUT_PROJECTNAME}" [[ -z "${INPUT_PROJECTVERSION}" ]] && SONAR_PROJECTVERSION="" || SONAR_PROJECTVERSION="${INPUT_PROJECTVERSION}"