mirror of
https://github.com/frappe/bench.git
synced 2025-01-10 09:02:10 +00:00
resolved conflicts
This commit is contained in:
parent
db13a947d2
commit
f45862a3ca
@ -1,5 +1,6 @@
|
|||||||
from bench.utils import exec_cmd
|
from bench.utils import exec_cmd
|
||||||
import click, sys, json
|
import click, sys, json
|
||||||
|
import os
|
||||||
|
|
||||||
@click.group()
|
@click.group()
|
||||||
def setup():
|
def setup():
|
||||||
@ -153,6 +154,27 @@ def setup_node_requirements():
|
|||||||
from bench.utils import update_node_packages
|
from bench.utils import update_node_packages
|
||||||
update_node_packages()
|
update_node_packages()
|
||||||
|
|
||||||
|
|
||||||
|
@click.command('manager')
|
||||||
|
def setup_manager():
|
||||||
|
"Setup bench-manager.local site with the bench_manager app installed on it"
|
||||||
|
from six.moves import input
|
||||||
|
create_new_site = True
|
||||||
|
if 'bench-manager.local' in os.listdir('sites'):
|
||||||
|
ans = input('Site aleady exists. Overwrite existing new site? [Y/n]: ')
|
||||||
|
while ans.lower() not in ['y', 'n', '']:
|
||||||
|
ans = input('Please type "y" or "n". Site aleady exists. Overwrite existing new site? [Y/n]: ')
|
||||||
|
if ans=='n': create_new_site = False
|
||||||
|
if create_new_site: exec_cmd("bench new-site --force bench-manager.local")
|
||||||
|
|
||||||
|
if 'bench_manager' in os.listdir('apps'):
|
||||||
|
print('App aleady exists. Skipping downloading the app')
|
||||||
|
else:
|
||||||
|
exec_cmd("bench get-app bench_manager")
|
||||||
|
|
||||||
|
exec_cmd("bench --site bench-manager.local install-app bench_manager")
|
||||||
|
|
||||||
|
|
||||||
@click.command('config')
|
@click.command('config')
|
||||||
def setup_config():
|
def setup_config():
|
||||||
"overwrite or make config.json"
|
"overwrite or make config.json"
|
||||||
@ -246,6 +268,7 @@ setup.add_command(setup_env)
|
|||||||
setup.add_command(setup_procfile)
|
setup.add_command(setup_procfile)
|
||||||
setup.add_command(setup_socketio)
|
setup.add_command(setup_socketio)
|
||||||
setup.add_command(setup_requirements)
|
setup.add_command(setup_requirements)
|
||||||
|
setup.add_command(setup_manager)
|
||||||
setup.add_command(setup_config)
|
setup.add_command(setup_config)
|
||||||
setup.add_command(setup_fonts)
|
setup.add_command(setup_fonts)
|
||||||
setup.add_command(add_domain)
|
setup.add_command(add_domain)
|
||||||
|
Loading…
Reference in New Issue
Block a user