guillaumearm/cc-libs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(installer): run postinstall before servers

Browse Source
This commit is contained in:
Guillaume ARM 2026-06-15 02:07:44 +02:00
parent 196152921b
commit fd36bded49
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install-trapos.lua
View File

@ -1,4 +1,4 @@
local _VERSION = '6.0.0'; local _VERSION = '6.0.1';
local REPO_BASE = 'https://git.trapcloud.fr/guillaumearm/cc-libs/raw/branch/master/'; local REPO_BASE = 'https://git.trapcloud.fr/guillaumearm/cc-libs/raw/branch/master/';
local LOCAL_STATE_DIR = '/trapos'; local LOCAL_STATE_DIR = '/trapos';
@ -224,11 +224,10 @@ end
-- Full install: sync the registry and install the TrapOS meta-package. -- Full install: sync the registry and install the TrapOS meta-package.
shell.execute('ccpm', 'update'); shell.execute('ccpm', 'update');
shell.execute('ccpm', 'install', 'trapos'); shell.execute('ccpm', 'install', 'trapos');
shell.execute('trapos-postinstall');
if fs.exists('/startup/servers.lua') then if fs.exists('/startup/servers.lua') then
shell.execute('/startup/servers.lua'); shell.execute('/startup/servers.lua');
end end
shell.execute('trapos-postinstall');
shell.setDir(previousDir); shell.setDir(previousDir);

23
tests/install-trapos.lua
View File

@ -119,6 +119,17 @@ local function findExecute(calls, program, firstArg)
return false; return false;
end end
local function findExecuteIndex(calls, program, firstArg)
for i, call in ipairs(calls.executes) do
if call.program == program then
if firstArg == nil or call.args[1] == firstArg then
return i;
end
end
end
return nil;
end
testlib.test('programs path resolves the ccpm command', function() testlib.test('programs path resolves the ccpm command', function()
local previous = shell.path(); local previous = shell.path();
shell.setPath('/rom/programs:/programs'); shell.setPath('/rom/programs:/programs');
@ -150,6 +161,18 @@ testlib.test('default install runs update, install trapos and postinstall', func
testlib.assertTrue(findExecute(calls, 'trapos-postinstall')); testlib.assertTrue(findExecute(calls, 'trapos-postinstall'));
end); end);
testlib.test('default install runs postinstall before startup servers', function()
local root = '/install-trapos-test/order';
local calls = runInstall(root, {});
local postinstallIndex = findExecuteIndex(calls, 'trapos-postinstall');
local startupIndex = findExecuteIndex(calls, '/startup/servers.lua');
testlib.assertTrue(postinstallIndex ~= nil, 'postinstall was not run');
if startupIndex ~= nil then
testlib.assertTrue(postinstallIndex < startupIndex, 'postinstall must run before startup servers');
end
end);
testlib.test('--cpm-only stops after the ccpm bootstrap', function() testlib.test('--cpm-only stops after the ccpm bootstrap', function()
local root = '/install-trapos-test/cpm-only'; local root = '/install-trapos-test/cpm-only';
local calls = runInstall(root, { '--cpm-only' }); local calls = runInstall(root, { '--cpm-only' });