mirror of
https://github.com/CHN-beta/nixos.git
synced 2026-01-11 17:29:30 +08:00
packages.chn-bsub: use fixed bash
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
{ stdenv, cmake, pkg-config, ftxui, biu, bsubConfig ? null, lib }: stdenv.mkDerivation
|
||||
{ stdenv, cmake, pkg-config, ftxui, biu, bsubConfig ? null, lib, bash }: stdenv.mkDerivation
|
||||
{
|
||||
name = "chn-bsub";
|
||||
src = ./.;
|
||||
buildInputs = [ ftxui biu ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
postInstall = "ln -s chn-bsub $out/bin/chn_bsub";
|
||||
cmakeFlags = lib.optional (bsubConfig != null) [ "-DBSUB_CONFIG=${bsubConfig}" ];
|
||||
cmakeFlags = [ "-DBSUB_SH=${bash}/bin/sh" ] ++ lib.optionals (bsubConfig != null) [ "-DBSUB_CONFIG=${bsubConfig}" ];
|
||||
passthru = { inherit bsubConfig; };
|
||||
}
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
# ifndef BSUB_CONFIG
|
||||
# define BSUB_CONFIG "./bsub.yaml"
|
||||
# endif
|
||||
# ifndef BSUB_SH
|
||||
# define BSUB_SH "/bin/sh"
|
||||
# endif
|
||||
|
||||
using namespace biu::literals;
|
||||
|
||||
@@ -166,8 +169,8 @@ int main()
|
||||
// 提交任务
|
||||
log.debug("submit command: {}"_f(State.SubmitCommand));
|
||||
// -c 对 \\n 的处理与通常情况下不同,我们需要用 -s 然后将命令通过标准输入传入
|
||||
biu::exec<{.SearchPath = true, .Stdin = biu::IoType::String}>
|
||||
({.Program = "sh", .Args = { "-s"}, .Stdin = State.SubmitCommand});
|
||||
biu::exec<{.Stdin = biu::IoType::String}>
|
||||
({.Program = BSUB_SH, .Args = { "-s"}, .Stdin = State.SubmitCommand});
|
||||
break;
|
||||
}
|
||||
else if (!State.UserCommand) return EXIT_FAILURE;
|
||||
|
||||
Reference in New Issue
Block a user