diff --git a/bazarr.py b/bazarr.py index d67613c87..b5f5e103f 100644 --- a/bazarr.py +++ b/bazarr.py @@ -1,3 +1,5 @@ +bazarr_version = '0.1.1' + from bottle import route, run, template, static_file, request, redirect import bottle bottle.debug(True) @@ -306,7 +308,7 @@ def system(): elif job.trigger.__str__().startswith('cron'): task_list.append([job.name, job.trigger.__str__(), pretty.date(job.next_run_time.replace(tzinfo=None)), job.id]) - return template('system', tasks=tasks, logs=logs, base_url=base_url, task_list=task_list) + return template('system', tasks=tasks, logs=logs, base_url=base_url, task_list=task_list, bazarr_version=bazarr_version) @route(base_url + 'execute/') def execute_task(taskid): diff --git a/check_update.py b/check_update.py index 9d7c84c0c..f4ecc2e33 100644 --- a/check_update.py +++ b/check_update.py @@ -20,7 +20,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'): # We can just fastforward elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD: repo.checkout_tree(repo.get(remote_id)) - master_ref = repo.lookup_reference('refs/heads/master') + master_ref = repo.lookup_reference('refs/heads/' + branch) master_ref.set_target(remote_id) repo.head.set_target(remote_id) result = 'Bazarr updated to latest version and restarting.' diff --git a/views/system.tpl b/views/system.tpl index 2523898d5..3f9b43ffb 100644 --- a/views/system.tpl +++ b/views/system.tpl @@ -141,7 +141,7 @@ icon">
- About + Bazarr version: {{bazarr_version}}