diff --git a/manifest.json b/manifest.json index 74bfeec..f235733 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "TrapOS", - "version": "0.5.0", + "version": "0.5.1", "branch": "next", "packages": [ "trapos" diff --git a/packages/index.json b/packages/index.json index 68e3e56..0ef25a1 100644 --- a/packages/index.json +++ b/packages/index.json @@ -2,10 +2,10 @@ "packages": { "tos-core": "0.3.0", "tos-test": "0.2.0", - "tos-boot": "0.2.0", + "tos-boot": "0.2.1", "tos-net": "0.2.0", "tos-ui": "0.2.0", "tos-ai": "0.2.0", - "trapos": "0.5.0" + "trapos": "0.5.1" } } diff --git a/packages/tos-boot/ccpm.json b/packages/tos-boot/ccpm.json index c5d5243..def2d1a 100644 --- a/packages/tos-boot/ccpm.json +++ b/packages/tos-boot/ccpm.json @@ -1,6 +1,6 @@ { "name": "tos-boot", - "version": "0.2.0", + "version": "0.2.1", "description": "TrapOS boot: startup MOTD and autostart server launcher", "dependencies": ["tos-core"], "files": [ diff --git a/packages/trapos/ccpm.json b/packages/trapos/ccpm.json index 5c96e63..b329a92 100644 --- a/packages/trapos/ccpm.json +++ b/packages/trapos/ccpm.json @@ -1,6 +1,6 @@ { "name": "trapos", - "version": "0.5.0", + "version": "0.5.1", "description": "TrapOS full install meta-package", "dependencies": ["tos-boot", "tos-net", "tos-ui", "tos-test"], "files": [], diff --git a/startup/servers.lua b/startup/servers.lua index 88882fe..a592c3e 100644 --- a/startup/servers.lua +++ b/startup/servers.lua @@ -1,4 +1,4 @@ -local _VERSION = '1.3.2' +local _VERSION = '1.3.3' local LOCAL_MANIFEST_PATH = '/trapos/manifest.json'; @@ -55,6 +55,6 @@ if #SERVERS > 0 then end end -parallel.waitForAll(shellFn, table.unpack(servers)); +parallel.waitForAny(shellFn, table.unpack(servers)); os.shutdown(); diff --git a/tests/startup-servers.lua b/tests/startup-servers.lua index f5dc0ea..0eafc3a 100644 --- a/tests/startup-servers.lua +++ b/tests/startup-servers.lua @@ -26,7 +26,7 @@ local function runStartupWithStubs() sleep = function() end, }, parallel = { - waitForAll = function(firstFn) + waitForAny = function(firstFn) firstFn(); end, },