Merge branch 'dev' of https://github.com/fin-tic/fintic into dev
This commit is contained in:
commit
98ec1aab63
@ -223,7 +223,7 @@ def updateNews(api_key, logf):
|
||||
|
||||
if all_settings['use_country']:
|
||||
if all_settings['country'] == 'Worldwide':
|
||||
url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news_worldwide'
|
||||
url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news_worldwide?'
|
||||
else:
|
||||
c_dict = {'United States':'US', 'Australia':'AU', 'Canada': 'CA', 'Great Britain':'GB', 'New Zealand':'NZ', 'Ireland':'IE', 'Singapore':'SG', 'South Africa': 'ZA'}
|
||||
cc = c_dict[all_settings['country']]
|
||||
|
@ -262,13 +262,8 @@ def stop():
|
||||
|
||||
@app.route("/update", methods=['PUT','POST'])
|
||||
def update():
|
||||
uptodate = os.system('sudo ./check_update.sh')
|
||||
print('python:', uptodate)
|
||||
|
||||
print(uptodate == 'not up to date')
|
||||
print(uptodate == 'up to date')
|
||||
#os.system("./update.sh")
|
||||
#os.system("sudo reboot now")
|
||||
os.system("./update.sh")
|
||||
os.system("sudo reboot now")
|
||||
return index()
|
||||
|
||||
@app.route("/restart")
|
||||
|
Loading…
Reference in New Issue
Block a user