aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-09-16 19:45:20 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2019-09-16 19:45:20 +0300
commit8f2ab4522908df982b89382e57c001f6869ccad6 (patch)
tree104ac6f9ae6f20966110b11e0318c5a4a737c444
parent987742373645d4d4de20059066ef1855478753e7 (diff)
parentaf12b6fd294c3019b8109d9607cd24740a0d3a99 (diff)
downloadtor-8f2ab4522908df982b89382e57c001f6869ccad6.tar.gz
tor-8f2ab4522908df982b89382e57c001f6869ccad6.zip
Merge branch 'tor-github/pr/1313'
-rwxr-xr-xscripts/maint/checkShellScripts.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh
index 02d1275c48..318f0fb577 100755
--- a/scripts/maint/checkShellScripts.sh
+++ b/scripts/maint/checkShellScripts.sh
@@ -21,7 +21,7 @@ if command -v realpath ; then
HERE=$(dirname "$(realpath "$0")")
else
HERE=$(dirname "$0")
- if [ ! -d "$HERE" ]; then
+ if [ ! -d "$HERE" ] || [ "$HERE" = "." ]; then
HERE=$(dirname "$PWD/$0")
fi
fi
@@ -31,6 +31,7 @@ TOPLEVEL=$(dirname "$(dirname "$HERE")")
if [ ! -d "$TOPLEVEL/src" ]; then
printf "Error: Couldn't find src directory in expected location: %s\\n" \
"$TOPLEVEL/src"
+ exit 1
fi
# Check *.sh scripts, but ignore the ones that we can't fix