mirror of
https://github.com/frappe/bench.git
synced 2024-11-13 16:56:33 +00:00
Merge pull request #1061 from gavindsouza/setup-prereqs-first
fix: Install Script fixes
This commit is contained in:
commit
81d5b218f0
@ -269,7 +269,7 @@ def install_bench(args):
|
|||||||
|
|
||||||
def clone_bench_repo(args):
|
def clone_bench_repo(args):
|
||||||
'''Clones the bench repository in the user folder'''
|
'''Clones the bench repository in the user folder'''
|
||||||
branch = args.bench_branch or 'master'
|
branch = args.bench_branch or 'develop'
|
||||||
repo_url = args.repo_url or 'https://github.com/frappe/bench'
|
repo_url = args.repo_url or 'https://github.com/frappe/bench'
|
||||||
|
|
||||||
if os.path.exists(tmp_bench_repo):
|
if os.path.exists(tmp_bench_repo):
|
||||||
@ -464,11 +464,11 @@ if __name__ == '__main__':
|
|||||||
with warnings.catch_warnings():
|
with warnings.catch_warnings():
|
||||||
warnings.simplefilter("ignore")
|
warnings.simplefilter("ignore")
|
||||||
setup_log_stream(args)
|
setup_log_stream(args)
|
||||||
|
install_prerequisites()
|
||||||
setup_script_requirements()
|
setup_script_requirements()
|
||||||
check_distribution_compatibility()
|
check_distribution_compatibility()
|
||||||
check_system_package_managers()
|
check_system_package_managers()
|
||||||
check_environment()
|
check_environment()
|
||||||
install_prerequisites()
|
|
||||||
install_bench(args)
|
install_bench(args)
|
||||||
|
|
||||||
log("Bench + Frappe + ERPNext has been successfully installed!")
|
log("Bench + Frappe + ERPNext has been successfully installed!")
|
||||||
|
Loading…
Reference in New Issue
Block a user