From 886aad9d0029c01faf55f6691f1166d104e7ebae Mon Sep 17 00:00:00 2001 From: brulijam Date: Sat, 8 Jun 2024 20:42:14 +0200 Subject: [PATCH] . --- src/brulijam/setLabel.lua | 5 +++++ src/brulijam/sync.lua | 25 ++++++++++++------------- src/startup.lua | 7 +------ 3 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 src/brulijam/setLabel.lua diff --git a/src/brulijam/setLabel.lua b/src/brulijam/setLabel.lua new file mode 100644 index 0000000..c5dbf89 --- /dev/null +++ b/src/brulijam/setLabel.lua @@ -0,0 +1,5 @@ +local hash = require("lib.hash") +if os.getComputerLabel() == nil then + local labelMainPart = string.sub(hash.digestStr(string.format(os.getComputerID())), 1, 6) + os.setComputerLabel(labelPrefix .. "-" .. labelMainPart) +end \ No newline at end of file diff --git a/src/brulijam/sync.lua b/src/brulijam/sync.lua index 2684e9d..5109440 100644 --- a/src/brulijam/sync.lua +++ b/src/brulijam/sync.lua @@ -4,23 +4,22 @@ local copyList = { [0] = "/brulijam/sync.lua", [1] = "/startup.lua", [2] = "/brulijam/systemlock.lua" + [3] = "/brulijam/setLabel.lua" - [3] = "/brulijam/files/oreTable.txt", + [4] = "/brulijam/files/oreTable.txt", - [4] = "/brulijam/lib/aes.lua", - [5] = "/brulijam/lib/hash.lua", - [6] = "/brulijam/lib/basic.lua", - [7] = "/brulijam/lib/networking.lua", + [5] = "/brulijam/lib/aes.lua", + [6] = "/brulijam/lib/hash.lua", + [7] = "/brulijam/lib/basic.lua", + [8] = "/brulijam/lib/networking.lua", - [8] = "/brulijam/turtle-roomCreator.lua", - [9] = "/brulijam/turtle-miner-stupidExcavate.lua", - [10] = "/brulijam/turtle-miner-fibo.lua", - [11] = "/brulijam/turtle-treeFarmer.lua", + [9] = "/brulijam/turtle-roomCreator.lua", + [10] = "/brulijam/turtle-miner-stupidExcavate.lua", + [11] = "/brulijam/turtle-miner-fibo.lua", + [12] = "/brulijam/turtle-treeFarmer.lua", - [12] = "/brulijam/gps-tower.lua", - [13] = "/brulijam/log-receiver.lua", - - + [13] = "/brulijam/gps-tower.lua", + [14] = "/brulijam/log-receiver.lua", } diff --git a/src/startup.lua b/src/startup.lua index a7a23c0..4ae5bfb 100644 --- a/src/startup.lua +++ b/src/startup.lua @@ -24,12 +24,7 @@ shell.run("/brulijam/sync.lua") --set label if not set -local hash = require("brulijam.lib.hash") -if os.getComputerLabel() == nil then - print("wuauw") - local labelMainPart = string.sub(hash.digestStr(string.format(os.getComputerID())), 1, 6) - os.setComputerLabel(labelPrefix .. "-" .. labelMainPart) -end +shell.run("/brulijam/setLabel.lua") shell.run("/brulijam/systemlock.lua")