Skip to content

Commit

Permalink
Merge branch 'add-support-for-tomcat-devonfw#1143' of https://github.…
Browse files Browse the repository at this point in the history
…com/Leosssss/ide into add-support-for-tomcat-devonfw#1143
  • Loading branch information
Leosssss committed Jun 29, 2023
2 parents 0ea5acc + fe3dcda commit a2d4a59
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions scripts/src/main/resources/scripts/command/tomcat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ "${1}" = "shortlist" ]
then
if [ -z "${2}" ]
then
echo "setup version help"
echo "setup start stop version help"
fi
exit
fi
Expand All @@ -16,10 +16,9 @@ fi
source "$(dirname "${0}")"/../functions
export CATALINA_HOME="${DEVON_IDE_HOME}/software/tomcat"
TOMCAT_HOME="${DEVON_IDE_HOME}/software/tomcat"
TOMCAT="${TOMCAT_HOME}/bin/startup.bat"
TOMCAT="catalina.sh"
TOMCAT="${TOMCAT_HOME}/bin/catalina.sh"

TOOL_VERSION_COMMAND="${TOMCAT_HOME}/bin/${TOMCAT} version"
TOOL_VERSION_COMMAND="${TOMCAT} version"
# shellcheck source=scripts/commandlet-cli
source "$(dirname "${0}")"/../commandlet-cli

Expand Down Expand Up @@ -57,7 +56,6 @@ function doTomcat() {
then
echo "Tomcat is running at localhost on the following port (default 8080):"
grep 'Connector port=' "${TOMCAT_HOME}/conf/server.xml" | awk -F'"' '{print $2}'| head -1

fi
}

Expand All @@ -70,7 +68,6 @@ then
echo " start start tomcat on your machine"
echo " stop stop tomcat on your machine"
echo " setup install tomcat on your machine (install, verify)"

elif [ "${1}" = "setup" ]
then
doSetup "${2}"
Expand All @@ -82,4 +79,4 @@ then
doStop
else
doFail "undefined argument ${*}"
fi
fi

0 comments on commit a2d4a59

Please sign in to comment.