|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+from asyncio import subprocess
|
|
1
|
2
|
import tkinter
|
|
2
|
3
|
import json
|
|
3
|
4
|
import paramiko
|
|
|
@@ -162,11 +163,11 @@ entry_customer_code.pack()
|
|
162
|
163
|
button_confirm.pack()
|
|
163
|
164
|
|
|
164
|
165
|
if __name__ == "__main__":
|
|
165
|
|
- lastmod = int(os.path.getmtime('./main.py'))
|
|
166
|
|
- #NOTE: UPDATE PROGRESSING....
|
|
167
|
|
- print(lastmod)
|
|
168
|
|
- os.system('git merge origin/alpha')
|
|
169
|
|
- if lastmod != int(os.path.getmtime('./main.py')):
|
|
|
166
|
+ check_git = subprocess.Popen(['git','merge','origin/alpha'], stdout=subprocess.PIPE, universal_newlines=True)
|
|
|
167
|
+ stdout, stderr = check_git.communicate()
|
|
|
168
|
+ print(stdout)
|
|
|
169
|
+ if stdout != "":
|
|
|
170
|
+ print('stdout not match')
|
|
170
|
171
|
pass
|
|
171
|
172
|
else:
|
|
172
|
173
|
window.mainloop()
|