From 2cdd938d49fb423bdf4fe6ee62d06e5865211729 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 13 Oct 2016 13:08:12 +0530 Subject: [PATCH] [fix] wkhtmltopdf executable --- playbooks/develop/includes/wkhtmltopdf.yml | 5 ++++- playbooks/install.py | 11 ++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/playbooks/develop/includes/wkhtmltopdf.yml b/playbooks/develop/includes/wkhtmltopdf.yml index 33ba9a35..f8a63294 100644 --- a/playbooks/develop/includes/wkhtmltopdf.yml +++ b/playbooks/develop/includes/wkhtmltopdf.yml @@ -11,4 +11,7 @@ - name: copy to /usr/local/bin copy: src="/tmp/wkhtmltox/bin/wkhtmltopdf" dest="/usr/local/bin/wkhtmltopdf" become: true - become_user: root \ No newline at end of file + become_user: root + + - name: make wkhtmltopdf executable + file: path=/usr/local/bin/wkhtmltopdf mode="o+x" \ No newline at end of file diff --git a/playbooks/install.py b/playbooks/install.py index 90482016..433e0e0a 100755 --- a/playbooks/install.py +++ b/playbooks/install.py @@ -245,7 +245,7 @@ def get_passwords(ignore_prompt=False): # admin password if not admin_password: - admin_password = getpass.unix_getpass(prompt='Please enter Administrator password: ') + admin_password = getpass.unix_getpass(prompt='Please enter the default Administrator user password: ') conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ') if admin_password != conf_admin_passswd: @@ -266,6 +266,8 @@ def get_passwords(ignore_prompt=False): with open(passwords_file_path, 'w') as f: json.dump(passwords, f, indent=1) + print 'Passwords saved at ~/passwords.txt' + return passwords def get_extra_vars_json(extra_args): @@ -348,9 +350,4 @@ if __name__ == '__main__': install_bench(args) - print ''' - Frappe/ERPNext has been successfully installed on your machine. - - Please find mysql root password and admin password in "passwords.txt" in your root directory, - you can remove the file after making note of the passwords. - ''' + print '''Frappe/ERPNext has been successfully installed!'''