huntedbytheirs
7e93db2d07
Portability (Linux distro-agnostic): - Remove hardcoded Clang compiler enforcement; GCC now builds - Add find_package(Threads REQUIRED) for older glibc - Add cmake install() target - FHS 3.0 default root: /kappa -> /usr/local/kappa - fs::path operator/ for all init/bootloader paths (fixes prefix fragility) - Multi-distro zoneinfo search (FHS, NixOS, Guix, alt) - Portable tar extraction (drop GNU-only --no-same-permissions) - Runit enable/disable commands now prefix-aware - --root CLI flag before/after subcommand, lazy directory creation - Shebang constants de-duplicated to types.hpp Correctness (race conditions, UB, corruption): - Fix CWD race in scheduler: per-child chdir() instead of process-global - Fix UB const_cast in exec_cmd/exec_capture: mutable argv buffers - Fix non-atomic installed DB writes: tmp+rename pattern - Fix read_file() no longer calls exit(1), throws instead - Fix silent catch(...) parse errors now print diagnostics - Fix rebuild false positives with config_hash change detection - Fix s6 disable_cmd copy-paste bug (was identical to enable) - Fix runit enable_cmd incomplete, disable_cmd wrong target - Fix dinit env vars: functional env-file + companion .env Quality: - Add -Wall -Wextra -Wpedantic to CMake, fix 2 pre-existing warnings - Move parse_int from error.hpp to parse_util.hpp - Fix hash verification guard checks all three hash types - Check patch return code in fetch.cpp - Add explicit system_dir creation in ensure_directories() - Add resolve to needs_dirs for build_registry() consistency - Update stale /kappa path references in examples - Remove inaccurate -Werror claim in CONTRIBUTING.md - Add build-gcc/ and agent dirs to .gitignore - Suppress clang-tidy portability-avoid-pragma-once - Fix .gitignore /kappa pattern (was matching include/kappa/) - Delete stale vcpkg_installed/ directory 54/54 tests pass. Builds on Clang and GCC with 0 warnings.
48 lines
1.2 KiB
C++
48 lines
1.2 KiB
C++
#include "kappa/service/service.hpp"
|
|
|
|
#include <format>
|
|
#include <sstream>
|
|
|
|
namespace kappa::service {
|
|
|
|
std::string generate_s6_service(const ServiceSpec& spec) {
|
|
std::ostringstream out;
|
|
|
|
// --- type file content ---
|
|
std::string type_content;
|
|
if (spec.type == "oneshot") {
|
|
type_content = "oneshot";
|
|
} else {
|
|
// "longrun", "notify", and anything else map to longrun in s6
|
|
type_content = "longrun";
|
|
}
|
|
|
|
// --- run file content ---
|
|
std::ostringstream run;
|
|
run << s6_execline_shebang;
|
|
run << "# Generated by kappa — do not edit manually\n";
|
|
run << std::format("# s6 service: {}\n", spec.name);
|
|
|
|
if (!spec.working_dir.empty()) {
|
|
run << std::format("cd {}\n", spec.working_dir);
|
|
}
|
|
for (const auto& [key, value] : spec.env) {
|
|
run << std::format("export {} \"{}\"\n", key, value);
|
|
}
|
|
if (!spec.user.empty()) {
|
|
run << std::format("s6-setuidgid {}\n", spec.user);
|
|
}
|
|
run << spec.exec << "\n";
|
|
|
|
// --- combined output ---
|
|
out << std::format("# --- s6 service directory: {} ---\n", spec.name);
|
|
out << "# file: type\n";
|
|
out << type_content << "\n";
|
|
out << "# file: run\n";
|
|
out << run.str();
|
|
|
|
return out.str();
|
|
}
|
|
|
|
} // namespace kappa::service
|