diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-07-07 21:26:09 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-07-07 21:26:09 +0000 |
| commit | 5b7df3128b29b513a4a283cff496e41e8372f0f6 (patch) | |
| tree | 1842ee7f9bf58bdc60003c50e49a63a20e0a131e /tools | |
| parent | 37915b4dd78d1b56796a21125e6938a0e05006e7 (diff) | |
Make sure "which" is present before we verify our tools. Add "env" to
the list of programs to check. Make sure our python scripts start with
"#!/usr/bin/env python" as recommended at
http://www.python.org/doc/faq/library.html#how-do-i-make-a-python-script-executable-on-unix
svn path=/trunk/; revision=14871
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/cvsdiff-fix.py | 2 | ||||
| -rw-r--r-- | tools/win32-setup.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/cvsdiff-fix.py b/tools/cvsdiff-fix.py index 17b5fc3be3..6d9ecd3f81 100755 --- a/tools/cvsdiff-fix.py +++ b/tools/cvsdiff-fix.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # cvsdiff-fix # diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 105e119b18..0650aab2cc 100644 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,6 +4,7 @@ DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-01-17/packages" err_exit () { + echo "" echo "ERROR: $1" echo "" exit 1 @@ -25,6 +26,8 @@ case "$1" in usage fi echo "Checking for required applications:" + which which > /dev/null 2>&1 || \ + err_exit "Can't find 'which'. Unable to proceed." for APP in $* ; do APP_PATH=`cygpath --unix $APP` if [ -x "$APP_PATH" -a ! -d "$APP_PATH" ] ; then |