From 877773bb5a78879a5038981d95153b05eea057b3 Mon Sep 17 00:00:00 2001 From: Guillaume ARM Date: Wed, 22 May 2024 20:39:22 +0200 Subject: [PATCH] chore: change install script and split different install files and add empty inferium-gui program --- inferium-gui.lua | 1 + install.lua | 49 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 inferium-gui.lua diff --git a/inferium-gui.lua b/inferium-gui.lua new file mode 100644 index 0000000..e505c41 --- /dev/null +++ b/inferium-gui.lua @@ -0,0 +1 @@ +print('TODO') \ No newline at end of file diff --git a/install.lua b/install.lua index 0521a50..18c2ee8 100644 --- a/install.lua +++ b/install.lua @@ -1,4 +1,4 @@ -local LIST_FILES = { +local LIST_TURTLE_FILES = { 'miner.lua', 'coal-crafter.lua', 'inferium-upgrader.lua', @@ -6,6 +6,24 @@ local LIST_FILES = { 'inferium-server.lua' }; +local LIST_TURTLE_CONFIG_FILES = { + 'config/mining.lua' +} + +local LIST_SERVER_FILES = { + 'inferium-server.lua' +} + +local LIST_SERVER_CONFIG_FILES = { + 'config/inferium.lua' +} + +local LIST_CLIENT_FILES = { + 'inferium-gui.lua' +} + +local LIST_CLIENT_CONFIG_FILES = {} + local LIST_LIBS_FILES = { 'libs/net.lua', 'libs/utils.lua', @@ -13,11 +31,9 @@ local LIST_LIBS_FILES = { 'libs/robot.lua' } -local LIST_CONFIG_FILES = { +local LIST_GLOBAL_CONFIG_FILES = { 'startup.lua', - 'upgrade.lua', - 'config/mining.lua', - 'config/inferium.lua' + 'upgrade.lua' } -- old files that need to be cleaned up @@ -45,9 +61,9 @@ local installFiles = function(list) end end -local installConfig = function() +local installConfig = function(list) -- do not override existing config files - for _, filePath in pairs(LIST_CONFIG_FILES) do + for _, filePath in pairs(list) do if filePath and not fs.exists(filePath) then shell.execute('wget', REPO_PREFIX .. filePath, filePath) end @@ -67,11 +83,24 @@ local mainSetup = function() prepareDirs() removeFiles(LIST_OLD_FILES) installFiles(LIST_LIBS_FILES) - installFiles(LIST_FILES) - installConfig() + + if turtle then + installFiles(LIST_TURTLE_FILES) + installConfig(LIST_TURTLE_CONFIG_FILES) + elseif pocket then + installFiles(LIST_CLIENT_FILES) + installConfig(LIST_CLIENT_CONFIG_FILES) + else -- regular computer + installFiles(LIST_CLIENT_FILES) + installConfig(LIST_CLIENT_CONFIG_FILES) + + installFiles(LIST_SERVER_FILES) + installConfig(LIST_SERVER_CONFIG_FILES) + end + + installConfig(LIST_GLOBAL_CONFIG_FILES) shell.setDir(previousDir) end mainSetup() -