Merge branch 'cbrunnkvist-master'

This commit is contained in:
Offensive Security 2014-12-10 17:27:36 +00:00
commit 119af4075c

View file

@ -9,9 +9,15 @@ TAGS=
SCASE='-i' SCASE='-i'
VERBOSE=0 VERBOSE=0
# if files.csv is in the searchsploit path, use that # if files.csv is in the searchsploit source path, use that
if [ -f "$( dirname $0 )/files.csv" ]; then scriptsrc=$0
csvpath="$( dirname $0 )/files.csv" while [ -h $scriptsrc ]; do
scriptsrc=$(readlink $scriptsrc)
[[ $scriptsrc != /* ]] && scriptsrc="$( cd -P $( dirname $scriptsrc ) && pwd )/$scriptsrc"
done
progdir="$( cd -P "$( dirname "$scriptsrc" )" && pwd )"
if [ -f "$progdir/files.csv" ]; then
csvpath="$progdir/files.csv"
fi fi
# usage info # usage info