clockworkpi/launcher
1
0
Fork 0
mirror of https://github.com/clockworkpi/launcher.git synced 2025-12-13 18:28:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix git reset hard version control tangle

Browse Source
This commit is contained in:
cuu 2018-05-27 11:45:20 +08:00
parent 27d113c613
commit 6b2ad6a58a
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Menu/GameShell/10_Settings/Update/__init__.py
View File

@ -14,7 +14,7 @@ from UI.icon_item import IconItem
from UI.icon_pool import MyIconPool from UI.icon_pool import MyIconPool
from UI.label import Label from UI.label import Label
from UI.fonts import fonts from UI.fonts import fonts
from UI.util_funcs import midRect,CmdClean from UI.util_funcs import midRect,CmdClean,get_git_revision_short_hash
from UI.keys_def import CurKeys from UI.keys_def import CurKeys
from UI.confirm_page import ConfirmPage from UI.confirm_page import ConfirmPage
from UI.download import Download from UI.download import Download
@ -282,7 +282,9 @@ class UpdatePage(Page):
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
elif "gitversion" in json_: ### just use git to run update elif "gitversion" in json_: ### just use git to run update
if config.VERSION != json_["gitversion"]: current_git_version = get_git_revision_short_hash()
if current_git_version != json_["gitversion"]:
self._ConfirmPage._URL = None self._ConfirmPage._URL = None
self._ConfirmPage._MD5 = None self._ConfirmPage._MD5 = None
self._ConfirmPage._GIT = True self._ConfirmPage._GIT = True

9
sys.py/UI/util_funcs.py
View File

@ -2,6 +2,7 @@
import pygame import pygame
import os import os
import subprocess
#from libs import easing #from libs import easing
#from datetime import datetime #from datetime import datetime
@ -11,6 +12,14 @@ import os
import string import string
from Xlib import X,display from Xlib import X,display
def get_git_revision_hash():
return subprocess.check_output(['git', 'rev-parse', 'HEAD'])
def get_git_revision_short_hash():
return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'])
def X_center_mouse(): def X_center_mouse():
d = display.Display() d = display.Display()
s = d.screen() s = d.screen()