Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix(fonts): remove unused setup_fonts method" #881

Merged
merged 1 commit into from
Dec 17, 2019
Merged

Revert "fix(fonts): remove unused setup_fonts method" #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bench/commands/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ def setup_redis():
generate_config('.')


@click.command('fonts')
def setup_fonts():
"Add frappe fonts to system"
from bench.utils import setup_fonts
setup_fonts()

@click.command('production')
@click.argument('user')
@click.option('--yes', help='Yes to regeneration config', is_flag=True, default=False)
Expand Down Expand Up @@ -318,6 +324,7 @@ def setup_systemd(user=None, yes=False, stop=False, create_symlinks=False, delet
setup.add_command(setup_requirements)
setup.add_command(setup_manager)
setup.add_command(setup_config)
setup.add_command(setup_fonts)
setup.add_command(add_domain)
setup.add_command(remove_domain)
setup.add_command(sync_domains)
Expand Down
14 changes: 14 additions & 0 deletions bench/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,20 @@ def validate_pillow_dependencies(bench_path, requirements):
def get_bench_name(bench_path):
return os.path.basename(os.path.abspath(bench_path))

def setup_fonts():
fonts_path = os.path.join('/tmp', 'fonts')

if os.path.exists('/etc/fonts_backup'):
return

exec_cmd("git clone https://github.com/frappe/fonts.git", cwd='/tmp')
os.rename('/etc/fonts', '/etc/fonts_backup')
os.rename('/usr/share/fonts', '/usr/share/fonts_backup')
os.rename(os.path.join(fonts_path, 'etc_fonts'), '/etc/fonts')
os.rename(os.path.join(fonts_path, 'usr_share_fonts'), '/usr/share/fonts')
shutil.rmtree(fonts_path)
exec_cmd("fc-cache -fv")

def set_git_remote_url(git_url, bench_path='.'):
"Set app remote git url"
app = git_url.rsplit('/', 1)[1].rsplit('.', 1)[0]
Expand Down