2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-11 15:51:03 +00:00

Fixed patch

This commit is contained in:
Neil Trini Lasrado 2016-08-08 13:48:27 +05:30
parent 98ab39637f
commit 7c13d16a62

View File

@ -3,26 +3,27 @@ from semantic_version import Version
from distutils.spawn import find_executable
def execute(bench_path):
expected_node_ver = Version('5.0.0')
node_exec = find_executable('node')
expected_node_ver = Version('5.0.0')
node_exec = find_executable('node') or find_executable('nodejs')
if node_exec:
result = subprocess.check_output([node_exec, '-v'])
else:
click.echo('''
No node executable was found on your machine.
Please install node 5.x before running "bench update".
Installation instructions for CentOS and Ubuntu can be found on the following link,
"https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/"
''')
sys.exit(1)
node_ver = Version(result.rstrip('\n').lstrip('v'))
if node_exec:
result = subprocess.check_output([node_exec, '-v'])
else:
click.echo('''
No node executable was found on your machine.
Please install node 5.x before running "bench update".
Installation instructions for CentOS and Ubuntu can be found on the following link,
"https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/"
''')
sys.exit(1)
if node_ver < expected_node_ver:
click.echo('''
Please update node version to 5.x before running "bench update".
Installation instructions for CentOS and Ubuntu can be found on the following link,
"https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/"
''')
sys.exit(1)
node_ver = Version(result.rstrip('\n').lstrip('v'))
if node_ver < expected_node_ver:
click.echo('''
Please update node version to 5.x before running "bench update".
Installation instructions for CentOS and Ubuntu can be found on the following link,
"https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/"
''')
sys.exit(1)