Author: markt Date: Mon Jul 9 19:51:33 2018 New Revision: 1835479 URL: http://svn.apache.org/viewvc?rev=1835479&view=rev Log: ws police
Modified: tomcat/trunk/bin/makebase.sh Modified: tomcat/trunk/bin/makebase.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1835479&r1=1835478&r2=1835479&view=diff ============================================================================== --- tomcat/trunk/bin/makebase.sh (original) +++ tomcat/trunk/bin/makebase.sh Mon Jul 9 19:51:33 2018 @@ -84,12 +84,12 @@ do mkdir "$BASE_TGT/$dir" done -if [ "$COPY_WEBAPPS" = true ]; then +if [ "$COPY_WEBAPPS" = true ]; then echo "Copying webapps" cp -r "$CATALINA_HOME/webapps" "$BASE_TGT/" # copy conf directory recursively cp -r "$CATALINA_HOME/conf" "$BASE_TGT/" -else +else # copy conf directory without subdirectories and suppress warning cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null fi --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org