scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed some failure related wording, changed command used to kill java processes

Browse Source
This commit is contained in:
Logan Lipke
2020-06-02 14:43:18 -07:00
parent 75a1f8ea4e
commit 7faccba20b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
auto-install-gui.py
View File

@@ -55,7 +55,7 @@ for file in dir:
dirFiles.append({'filename':file[25:], 'timestamp':fileTime}) dirFiles.append({'filename':file[25:], 'timestamp':fileTime})
if len(dirFiles) == 0: if len(dirFiles) == 0:
print(f"Failed to find file in {filePath} with version {ver}") print(f"Unable to find file in {filePath} with version {ver}")
#sys.exit(1) #sys.exit(1)
#============FIND NEWEST FILES============ #============FIND NEWEST FILES============
@@ -116,7 +116,7 @@ if newestWebFile['timestamp'] > newestDirFile['timestamp']:
#=========ATTEMPT TO RESTART GUI========== #=========ATTEMPT TO RESTART GUI==========
try: try:
print("Killing current GUI process") print("Killing current GUI process")
os.system("pgrep java | xargs kill") os.system("if pgrep java; then pgrep java | xargs kill -9 ;fi")
except Exception as e: except Exception as e:
print(f"{e}\nProcess kill failed. Please try again") print(f"{e}\nProcess kill failed. Please try again")
sys.exit(1) sys.exit(1)