anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor some code

Browse Source
This commit is contained in:
JonnyWong16
2018-02-24 10:09:02 -08:00
parent ab34a74210
commit 754fd24421
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plexpy/versioncheck.py
View File

@@ -20,9 +20,9 @@ import subprocess
import tarfile
import plexpy
import common
import logger
import request
import version
def runGit(args):
@@ -65,7 +65,7 @@ def runGit(args):
def getVersion():
if version.PLEXPY_BRANCH.startswith('win32build'):
if common.BRANCH.startswith('win32build'):
plexpy.INSTALL_TYPE = 'win'
# Don't have a way to update exe yet, but don't want to set VERSION to None
@@ -120,15 +120,15 @@ def getVersion():
version_file = os.path.join(plexpy.PROG_DIR, 'version.txt')
if not os.path.isfile(version_file):
return None, 'origin', 'master'
return None, 'origin', common.BRANCH
with open(version_file, 'r') as f:
current_version = f.read().strip(' \n\r')
if current_version:
return current_version, plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH
return current_version, 'origin', common.BRANCH
else:
return None, 'origin', 'master'
return None, 'origin', common.BRANCH
def checkGithub(auto_update=False):