10a11
> # Additional improvements by Jon S. Stumpf <jon.stumpf@gmail.com>.
30c31,35
< JVM_TMP=/tmp/tomcat7-$NAME-tmp
---
> 
> if [ -z "${JVM_TMP}" ]
> then
> 	JVM_TMP=/tmp/$NAME-tmp
> fi
52,54c57,69
< # Run Tomcat 7 as this user ID and group ID
< TOMCAT7_USER=tomcat7
< TOMCAT7_GROUP=tomcat7
---
> if [ -z "${TOMCAT7_USER}" ]
> then
> 	TOMCAT7_USER=tomcat7
> fi
> 
> if [ -z "${TOMCAT7_GROUP}" ]
> then
> 	TOMCAT7_GROUP=tomcat7
> fi
> 
> if [ -z "${JAVA_HOME}" ]
> then
> 	### I did not indent the block below so that you can better see the changes within.
65c80
<                         OPENJDKS=$jvmdir
---
>                         OPENJDKS="${OPENJDKS} ${jvmdir}"
88a104,107
> 
> 	### The block above should be indented
> fi
> 
91c110
< # Directory where the Tomcat 6 binary distribution resides
---
> # Directory where the Tomcat 7 binary distribution resides
98c117,120
< TOMCAT7_SECURITY=no
---
> if [ -z "${TOMCAT7_SECURITY}" ]
> then
> 	TOMCAT7_SECURITY=no
> fi
202c224,235
< 		echo "// AUTO-GENERATED FILE from /etc/tomcat7/policy.d/" \
---
> 
> 		CBCP_LOGICAL="${CATALINA_BASE}/conf/policy.d"
> 		CBCP_PHYSICAL="$(cd ${CBCP_LOGICAL}; pwd -P)"
> 
> 		if [ "${CBCP_PHYSICAL}" != "${CBCP_LOGICAL}" ]
> 		then
> 			CBCP_PHYSICAL=" (aka ${CBCP_PHYSICAL})"
> 		else
> 			CBCP_PHYSICAL=""
> 		fi
> 
> 		echo "// AUTO-GENERATED FILE from ${CBCP_LOGICAL}${CBCP_PHYSICAL}" \