2
0
mirror of https://github.com/frappe/bench.git synced 2024-09-27 22:39:03 +00:00

fix: create bench folder in user directory

This commit is contained in:
Nicolas Streng 2021-02-16 16:45:07 +01:00
parent e5d4027f46
commit 5c5d2b57df
5 changed files with 14 additions and 8 deletions

View File

@ -11,7 +11,7 @@
- name: Set home folder perms - name: Set home folder perms
file: file:
path: '/home/{{ frappe_user }}' path: '{{ user_directory }}'
mode: 'o+rx' mode: 'o+rx'
owner: '{{ frappe_user }}' owner: '{{ frappe_user }}'
group: '{{ frappe_user }}' group: '{{ frappe_user }}'

View File

@ -33,7 +33,7 @@
- name: Fix permissions - name: Fix permissions
become_user: root become_user: root
command: chown {{ frappe_user }} -R /home/{{ frappe_user }} command: chown {{ frappe_user }} -R {{ user_directory }}
- name: python3 bench init for develop - name: python3 bench init for develop
command: bench init {{ bench_path }} --frappe-path {{ frappe_repo_url }} --frappe-branch {{ frappe_branch }} --python {{ python }} command: bench init {{ bench_path }} --frappe-path {{ frappe_repo_url }} --frappe-branch {{ frappe_branch }} --python {{ python }}
@ -77,6 +77,6 @@
# Setup Bench for production environment # Setup Bench for production environment
- include_tasks: setup_bench_production.yml - include_tasks: setup_bench_production.yml
vars: vars:
bench_path: "/home/{{ frappe_user }}/{{ bench_name }}" bench_path: "{{ user_directory }}/{{ bench_name }}"
when: not run_travis and production when: not run_travis and production
... ...

View File

@ -1,7 +1,7 @@
--- ---
- name: insert/update inputrc for history - name: insert/update inputrc for history
blockinfile: blockinfile:
dest: "/home/{{ frappe_user }}/.inputrc" dest: "{{ user_directory }}/.inputrc"
create: yes create: yes
block: | block: |
## arrow up ## arrow up

View File

@ -40,8 +40,8 @@
- name: setup bench and dev environment - name: setup bench and dev environment
hosts: localhost hosts: localhost
vars: vars:
bench_repo_path: "/home/{{ frappe_user }}/.bench" bench_repo_path: "{{ user_directory }}/.bench"
bench_path: "/home/{{ frappe_user }}/{{ bench_name }}" bench_path: "{{ user_directory }}/{{ bench_name }}"
roles: roles:
# setup frappe-bench # setup frappe-bench
- { role: bench, tags: "bench", when: not run_travis and not without_bench_setup } - { role: bench, tags: "bench", when: not run_travis and not without_bench_setup }

View File

@ -232,9 +232,10 @@ def install_bench(args):
extra_vars = vars(args) extra_vars = vars(args)
extra_vars.update(frappe_user=args.user) extra_vars.update(frappe_user=args.user)
extra_vars.update(user_directory=get_user_home_directory(args.user))
if os.path.exists(tmp_bench_repo): if os.path.exists(tmp_bench_repo):
repo_path = tmp_bench_repo repo_path = tmp_bench_repo
else: else:
repo_path = os.path.join(os.path.expanduser('~'), 'bench') repo_path = os.path.join(os.path.expanduser('~'), 'bench')
@ -383,6 +384,11 @@ def get_extra_vars_json(extra_args):
return ('@' + json_path) return ('@' + json_path)
def get_user_home_directory(user):
# Return home directory /home/USERNAME or anything else defined as home directory in
# passwd for user.
return os.path.expanduser('~'+user)
def run_playbook(playbook_name, sudo=False, extra_vars=None): def run_playbook(playbook_name, sudo=False, extra_vars=None):
args = ['ansible-playbook', '-c', 'local', playbook_name , '-vvvv'] args = ['ansible-playbook', '-c', 'local', playbook_name , '-vvvv']