From b5876fc25e1f2aab46ebb47d9c41214d6a46e5eb Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 2 Apr 2011 23:32:42 +0000
Subject: [PATCH] Clarify error messages in *.sh files to mention that if a
 script is not found it might be that it does exist but does not have the
 execute permission. http://markmail.org/message/k2ynjwbqjcver6ka

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1088179 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/configtest.sh          | 1 +
 bin/digest.sh              | 1 +
 bin/shutdown.sh            | 1 +
 bin/startup.sh             | 1 +
 bin/version.sh             | 1 +
 webapps/docs/changelog.xml | 8 ++++++++
 6 files changed, 13 insertions(+)

diff --git a/bin/configtest.sh b/bin/configtest.sh
index f854b925e..597d9154a 100755
--- a/bin/configtest.sh
+++ b/bin/configtest.sh
@@ -56,6 +56,7 @@ if $os400; then
 else
   if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
     echo "Cannot find $PRGDIR/$EXECUTABLE"
+    echo "The file is absent or does not have execute permission"
     echo "This file is needed to run this program"
     exit 1
   fi
diff --git a/bin/digest.sh b/bin/digest.sh
index 4845c20d5..2bffe2aed 100755
--- a/bin/digest.sh
+++ b/bin/digest.sh
@@ -40,6 +40,7 @@ EXECUTABLE=tool-wrapper.sh
 # Check that target executable exists
 if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
   echo "Cannot find $PRGDIR/$EXECUTABLE"
+  echo "The file is absent or does not have execute permission"
   echo "This file is needed to run this program"
   exit 1
 fi
diff --git a/bin/shutdown.sh b/bin/shutdown.sh
index 36fd211c2..0aa93ef35 100755
--- a/bin/shutdown.sh
+++ b/bin/shutdown.sh
@@ -40,6 +40,7 @@ EXECUTABLE=catalina.sh
 # Check that target executable exists
 if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
   echo "Cannot find $PRGDIR/$EXECUTABLE"
+  echo "The file is absent or does not have execute permission"
   echo "This file is needed to run this program"
   exit 1
 fi
diff --git a/bin/startup.sh b/bin/startup.sh
index 4e4e9fe01..1e2e76fb2 100755
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -56,6 +56,7 @@ if $os400; then
 else
   if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
     echo "Cannot find $PRGDIR/$EXECUTABLE"
+    echo "The file is absent or does not have execute permission"
     echo "This file is needed to run this program"
     exit 1
   fi
diff --git a/bin/version.sh b/bin/version.sh
index b6ed1c64f..07ee7f30a 100755
--- a/bin/version.sh
+++ b/bin/version.sh
@@ -40,6 +40,7 @@ EXECUTABLE=catalina.sh
 # Check that target executable exists
 if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
   echo "Cannot find $PRGDIR/$EXECUTABLE"
+  echo "The file is absent or does not have execute permission"
   echo "This file is needed to run this program"
   exit 1
 fi
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1a7af07e1..280f27bd0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,6 +59,14 @@
       </update>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <update>
+        Clarify error messages in *.sh files to mention that if a script is
+        not found it might be because execute permission is needed. (kkolinko)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.12 (markt)">
   <subsection name="Catalina">
-- 
2.11.0