mirror of
https://codeberg.org/icewind/haze.git
synced 2026-06-03 17:14:08 +02:00
app integration support
This commit is contained in:
parent
a80354c922
commit
3abf183ae3
2 changed files with 19 additions and 5 deletions
|
|
@ -8,9 +8,7 @@
|
||||||
coreutils,
|
coreutils,
|
||||||
getent,
|
getent,
|
||||||
shadow,
|
shadow,
|
||||||
buildEnv,
|
|
||||||
runCommand,
|
runCommand,
|
||||||
cacert,
|
|
||||||
callPackage,
|
callPackage,
|
||||||
cronie,
|
cronie,
|
||||||
redis,
|
redis,
|
||||||
|
|
@ -36,6 +34,7 @@
|
||||||
python3Packages,
|
python3Packages,
|
||||||
dnsmasq,
|
dnsmasq,
|
||||||
frankenphp,
|
frankenphp,
|
||||||
|
nushell,
|
||||||
}: let
|
}: let
|
||||||
inherit (builtins) toString;
|
inherit (builtins) toString;
|
||||||
inherit (lib) readFile getExe concatStringsSep splitString take;
|
inherit (lib) readFile getExe concatStringsSep splitString take;
|
||||||
|
|
@ -152,6 +151,7 @@
|
||||||
helix
|
helix
|
||||||
python3Packages.supervisor
|
python3Packages.supervisor
|
||||||
dnsmasq
|
dnsmasq
|
||||||
|
nushell
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,18 @@
|
||||||
#!/bin/sh
|
#!/bin/nu
|
||||||
|
|
||||||
cd $WEBROOT/build/integration
|
def main [feature: path, ...rest] {
|
||||||
./run.sh "$@"
|
mut feature = $feature;
|
||||||
|
mut workdir = $"($env.WEBROOT)/build/integration"
|
||||||
|
if ($feature | str starts-with "apps/") {
|
||||||
|
let parts = $feature | split row '/'
|
||||||
|
occ app:enable $parts.1
|
||||||
|
let parts = $feature | split row -n 2 '/features/'
|
||||||
|
$workdir = $parts.0
|
||||||
|
$feature = $"features/($parts.1)"
|
||||||
|
} else if ($feature | str starts-with "build/integration/") {
|
||||||
|
$feature = $feature | str replace "build/integration/" ""
|
||||||
|
}
|
||||||
|
|
||||||
|
cd $workdir
|
||||||
|
bash run.sh $feature ...$rest
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue