Commit 16eb5f52 authored by James Coyle's avatar James Coyle

Merge branch 'james-dev' into 'master'

James dev

See merge request !14
parents c3e882de dc4d546c
Pipeline #1245 passed with stages
in 4 seconds
...@@ -170,7 +170,6 @@ def config_json(): ...@@ -170,7 +170,6 @@ def config_json():
def load_settings(): def load_settings():
<<<<<<< HEAD
if storjstatus_common.get_os_type() == "win": if storjstatus_common.get_os_type() == "win":
return load_settings_win() return load_settings_win()
elif storjstatus_common.get_os_type() == "linux": elif storjstatus_common.get_os_type() == "linux":
...@@ -192,8 +191,6 @@ def load_settings_win(): ...@@ -192,8 +191,6 @@ def load_settings_win():
def load_settings_linux(): def load_settings_linux():
=======
>>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
global APIKEY global APIKEY
global APISECRET global APISECRET
global SERVERGUID global SERVERGUID
......
__version__ = '0.3.0' __version__ = '0.3.1'
import os import os
import setuptools
from crate.client import connect from crate.client import connect
exec(open('storjstatus/version.py').read())
def main(): def main():
exec(open('storjstatus/version.py').read()) print("Updating database to version " + __version__)
print("Updating database to version " + __VERSION__)
connection = connect('data2.jamescoyle.net:4200') connection = connect('data2.jamescoyle.net:4200')
cursor = connection.cursor() cursor = connection.cursor()
cursor.execute("UPDATE storj.settings SET setting_value = '" + __VERSION__ + "' WHERE setting_name = 'storjstatus-client-version' ") cursor.execute("UPDATE storj.settings SET setting_value = '" + __version__ + "' WHERE setting_name = 'storjstatus-client-version' ")
if __name__ == "__main__": if __name__ == "__main__":
main() main()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment