diff --git a/dimple b/dimple index da0671b..4062fbd 100755 --- a/dimple +++ b/dimple @@ -3,11 +3,7 @@ this_dir="$(cd "$(dirname "$0")" && pwd)" if [ -e "$this_dir/main.py" ] && [ "$this_dir" != "$CCP4/bin" ]; then # development (source tree) version - if [ -e "$CCP4/bin/ccp4-python" ]; then - exec "$CCP4/bin/ccp4-python" "$this_dir/main.py" "$@" - else - exec python2.7 "$this_dir/main.py" "$@" - fi + exec python2.7 "$this_dir/main.py" "$@" else # installed module exec "$CCP4/bin/ccp4-python" -m dimple "$@" diff --git a/tests/test.bat b/tests/test.bat index c43fb7f..b924951 100644 --- a/tests/test.bat +++ b/tests/test.bat @@ -2,6 +2,6 @@ @set testdir=%~dp0 @echo === Run dimple on artificial thaumatin example === -@set PYTHONPATH=%testdir%.. -@call ccp4-python "%testdir%..\main.py" "%testdir%thaumatin.mtz" "%testdir%thaumatin.pdb" "%testdir%out" %* +@set PYTHONPATH=%testdir%..\.. +@call %CCP4%\..\Python2.7\python "%testdir%..\main.py" "%testdir%thaumatin.mtz" "%testdir%thaumatin.pdb" "%testdir%out" %* @pause