Skip to content

Commit

Permalink
fixed a bug causing trouble on systems with both python2 and python3 …
Browse files Browse the repository at this point in the history
…installed
  • Loading branch information
jewettaij committed May 28, 2020
1 parent 3c8b8d8 commit bad06eb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
12 changes: 5 additions & 7 deletions moltemplate/scripts/moltemplate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# Copyright (c) 2013

G_PROGRAM_NAME="moltemplate.sh"
G_VERSION="2.17.7"
G_DATE="2020-5-24"
G_VERSION="2.17.8"
G_DATE="2020-5-25"

echo "${G_PROGRAM_NAME} v${G_VERSION} ${G_DATE}" >&2
echo "" >&2
Expand All @@ -16,12 +16,10 @@ echo "" >&2
# I prefer python2 over python3 because python3 requires slightly more memory
# (and has more bugs). So use python2 (2.7) when available.

if which python2 > /dev/null; then
PYTHON_COMMAND='python2'
elif which python3 > /dev/null; then
PYTHON_COMMAND='python3'
if which python > /dev/null; then
PYTHON_COMMAND='python'
else
echo "Error: $G_PROGRAM_NAME requires python or python3" >&2
echo "Error: $G_PROGRAM_NAME requires python" >&2
exit 1
fi

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@

url='https://github.com/jewettaij/moltemplate',

download_url='https://github.com/jewettaij/moltemplate/archive/v2.17.7.zip',
download_url='https://github.com/jewettaij/moltemplate/archive/v2.17.8.zip',

version='2.17.7',
version='2.17.8',

keywords=['simulation', 'LAMMPS', 'molecule editor', 'molecule builder',
'ESPResSo'],
Expand Down

0 comments on commit bad06eb

Please sign in to comment.