mirror of https://github.com/morpheus65535/bazarr
Merge branch 'master' into development
This commit is contained in:
commit
8fac3cc23d
|
@ -25,7 +25,7 @@ Bazarr is a companion application to Sonarr. It manage and download subtitles ba
|
|||
|
||||
## Screenshot
|
||||
|
||||
You can get more in the screenshot directory but it should look familiar:
|
||||
You can get more in the [screenshot](https://github.com/morpheus65535/bazarr/tree/master/screenshot) directory but it should look familiar:
|
||||
|
||||
![Series](/screenshot/series.png?raw=true "Series")
|
||||
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
from get_general_settings import *
|
||||
|
||||
import git
|
||||
import os
|
||||
import subprocess
|
||||
result = subprocess.check_output(["git", "pull", '--dry-run', 'origin', branch], stderr=subprocess.STDOUT).split('\n')
|
||||
|
||||
g = git.cmd.Git(os.path.dirname(__file__))
|
||||
g.pull('origin ' + branch + ' --dry-run')
|
||||
|
||||
print g
|
||||
if len(result) > 2:
|
||||
subprocess.check_output(["git", "pull", 'origin', branch])
|
||||
os.execlp('python', os.path.join(os.path.dirname(__file__), 'bazarr.py'))
|
||||
|
|
Loading…
Reference in New Issue