diff options
| author | hexcoder- <heiko@hexco.de> | 2021-02-16 16:27:56 +0100 |
|---|---|---|
| committer | hexcoder- <heiko@hexco.de> | 2021-02-16 16:27:56 +0100 |
| commit | 7d97ffb1e82cd0ddebaa5e143ed326e41a6ca25b (patch) | |
| tree | 04868ea06129e0a553cdf8e48da1a62926385009 | |
| parent | 80bdbf7be0a1e7bd54b24d4376048d85fb403bf6 (diff) | |
| download | afl++-7d97ffb1e82cd0ddebaa5e143ed326e41a6ca25b.tar.gz | |
check for setuptools instead of easy_install
| -rwxr-xr-x | test/test-unicorn-mode.sh | 2 | ||||
| -rwxr-xr-x | unicorn_mode/build_unicorn_support.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/test-unicorn-mode.sh b/test/test-unicorn-mode.sh index b4c6eb3e..e197e226 100755 --- a/test/test-unicorn-mode.sh +++ b/test/test-unicorn-mode.sh @@ -14,7 +14,7 @@ test -d ../unicorn_mode/unicornafl -a -e ../unicorn_mode/unicornafl/samples/shel EASY_INSTALL_FOUND=0 for PYTHON in $PYTHONS ; do - if $PYTHON -c "help('easy_install');" </dev/null | grep -q module ; then + if $PYTHON -c "import setuptools" ; then EASY_INSTALL_FOUND=1 PY=$PYTHON diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh index f1d028f8..6c376f8d 100755 --- a/unicorn_mode/build_unicorn_support.sh +++ b/unicorn_mode/build_unicorn_support.sh @@ -117,19 +117,19 @@ done # some python version should be available now PYTHONS="`command -v python3` `command -v python` `command -v python2`" -EASY_INSTALL_FOUND=0 +SETUPTOOLS_FOUND=0 for PYTHON in $PYTHONS ; do if $PYTHON -c "import setuptools" ; then - EASY_INSTALL_FOUND=1 + SETUPTOOLS_FOUND=1 PYTHONBIN=$PYTHON break fi done -if [ "0" = $EASY_INSTALL_FOUND ]; then +if [ "0" = $SETUPTOOLS_FOUND ]; then echo "[-] Error: Python setup-tools not found. Run 'sudo apt-get install python-setuptools', or install python3-setuptools, or run '$PYTHONBIN -m ensurepip', or create a virtualenv, or ..." PREREQ_NOTFOUND=1 |