Index: cloud_sync.py =================================================================== diff -u -r8526ff48b8707a6ee883e3931dcbca0630ff3e15 -rb02f69db02eb8157d85f8d5c5b4e571784a6c212 --- cloud_sync.py (.../cloud_sync.py) (revision 8526ff48b8707a6ee883e3931dcbca0630ff3e15) +++ cloud_sync.py (.../cloud_sync.py) (revision b02f69db02eb8157d85f8d5c5b4e571784a6c212) @@ -19,7 +19,7 @@ import sys -VERSION = "0.4.11" +VERSION = "0.4.15" arguments = sys.argv @@ -33,13 +33,45 @@ sleep(5) # wait for UI to prepare the configurations partition try: - g_config = helpers_read_config(CONFIG_PATH) + ok = False + print(SETUP_CONSOLE_LINE) - if g_config[CONFIG_DEVICE][CONFIG_DEVICE_MODE] == 'operation': - g_config = helpers_read_config(OPERATION_CONFIG_FILE_PATH) - CONFIG_PATH = OPERATION_CONFIG_FILE_PATH + if EXEC_MODE_UPGRADE_KEY in arguments: # ---------- upgrade + # Read from $HOME + if os.path.isfile(CONFIG_PATH) and os.access(CONFIG_PATH, os.R_OK | os.W_OK): #TODO test if this check needed? + EXEC_MODE = EXEC_MODE_UPGRADE + g_config = helpers_read_config(CONFIG_PATH) + ok = True + else: + if EXEC_MODE_UPDATE_KEY in arguments: # ---------- update + EXEC_MODE = EXEC_MODE_UPDATE + print(f"CloudSync starting in {EXEC_MODE} mode") + print("CloudSync update config started...") + # Update the $HOME from /var/configuraitons/ and update result in both for later update + oldConfig = helpers_read_config(OPERATION_CONFIG_FILE_PATH) + newConfig = helpers_read_config(CONFIG_PATH) + newConfig.update(oldConfig) + helpers_write_config(None , CONFIG_PATH , newConfig) + helpers_write_config(OPERATION_CONFIG_PATH, OPERATION_CONFIG_FILE_PATH, newConfig) + print("CloudSync update config done.") + + # Read from /var/configuraitons/ # ---------- normal + if os.path.isfile(OPERATION_CONFIG_FILE_PATH) and os.access(OPERATION_CONFIG_FILE_PATH, os.R_OK): #TODO test if this check needed? + g_config = helpers_read_config(OPERATION_CONFIG_FILE_PATH) + CONFIG_PATH = OPERATION_CONFIG_FILE_PATH + ok = True + + if ok: + print(f"CloudSync started in {EXEC_MODE} mode") + print(f"Using config: {CONFIG_PATH}") + else: + g_utils.logger.error(f"Error reading config file in {EXEC_MODE}") + + print(SETUP_CONSOLE_LINE) + except Exception as e: - g_utils.logger.error("Error reading config file - {0}".format(e)) + g_utils.logger.error(f"Error reading config file - {e}") + print(SETUP_CONSOLE_LINE) sys.exit(0) try: