add a global shell variable

Author: DolceTriade

reposerver/README.md

@@ -19,6 +19,7 @@ See `reposerver/example.reposerver.toml` for a complete example.
 
 `global.indexer_args` are applied first for every invocation, then `repo.indexer_args` are appended.
 Per-branch args can be set with `[[repo.per_branch]]`; those args are appended last.
+Hooks run as `<global.shell> -c "<command>"` and `global.shell` defaults to `sh`.
 
 Optional global finish hook:
 

reposerver/example.reposerver.toml

@@ -2,6 +2,7 @@
 state_dir = ".reposerver-state"
 default_interval = "5m"
 max_repo_concurrency = 1
+shell = "sh"
 git_bin = "git"
 indexer_bin = "pointer-indexer"
 indexer_args = ["--upload-url", "http://127.0.0.1:8080/api/v1/index"]

reposerver/src/config.rs

@@ -18,6 +18,7 @@ pub struct GlobalConfig {
     pub state_dir: PathBuf,
     pub default_interval: Duration,
     pub max_repo_concurrency: usize,
+    pub shell: String,
     pub git_bin: String,
     pub indexer_bin: String,
     pub indexer_args: Vec<String>,
@@ -61,6 +62,7 @@ struct RawGlobalConfig {
     state_dir: Option<PathBuf>,
     default_interval: Option<String>,
     max_repo_concurrency: Option<usize>,
+    shell: Option<String>,
     git_bin: Option<String>,
     indexer_bin: Option<String>,
     #[serde(default)]
@@ -125,12 +127,16 @@ impl AppConfig {
 
         let max_repo_concurrency = raw.global.max_repo_concurrency.unwrap_or(1).max(1);
 
+        let shell = raw.global.shell.unwrap_or_else(|| "sh".to_string());
         let git_bin = raw.global.git_bin.unwrap_or_else(|| "git".to_string());
         let indexer_bin = raw
             .global
             .indexer_bin
             .unwrap_or_else(|| "pointer-indexer".to_string());
 
+        if shell.trim().is_empty() {
+            bail!("global.shell must not be empty");
+        }
         if git_bin.trim().is_empty() {
             bail!("global.git_bin must not be empty");
         }
@@ -142,6 +148,7 @@ impl AppConfig {
             state_dir,
             default_interval,
             max_repo_concurrency,
+            shell,
             git_bin,
             indexer_bin,
             indexer_args: raw.global.indexer_args,
@@ -331,9 +338,26 @@ mod tests {
         assert_eq!(cfg.repos.len(), 1);
         assert_eq!(cfg.repos[0].interval, Duration::from_secs(300));
         assert_eq!(cfg.global.max_repo_concurrency, 1);
+        assert_eq!(cfg.global.shell, "sh");
         assert!(cfg.global.indexer_args.is_empty());
     }
 
+    #[test]
+    fn rejects_empty_global_shell() {
+        let raw = r#"
+            [global]
+            shell = "   "
+
+            [[repo]]
+            name = "foo"
+            url = "git@example.com:foo.git"
+            branches = ["main"]
+        "#;
+        let parsed: FileConfig = toml::from_str(raw).expect("parse config");
+        let err = AppConfig::from_raw(parsed).expect_err("should fail");
+        assert!(err.to_string().contains("global.shell"));
+    }
+
     #[test]
     fn rejects_zero_duration() {
         let raw = r#"

reposerver/src/hooks.rs

@@ -16,6 +16,7 @@ pub struct HookResult {
 }
 
 pub async fn run_hook(
+    shell: &str,
     hook: &HookConfig,
     hook_type: &str,
     hook_index: usize,
@@ -28,6 +29,7 @@ pub async fn run_hook(
     info!(
         stage = "hook",
         event = "hook.begin",
+        shell = %shell,
         hook_type = %hook_type,
         hook_index,
         repo = %repo,
@@ -37,7 +39,7 @@ pub async fn run_hook(
         "starting hook command"
     );
 
-    let mut cmd = Command::new("sh");
+    let mut cmd = Command::new(shell);
     cmd.arg("-c").arg(&hook.command);
     cmd.env("REPOSERVER_REPO", repo);
     cmd.env("REPOSERVER_BRANCH", branch);

reposerver/src/scheduler.rs

@@ -518,6 +518,7 @@ impl Scheduler {
         for (idx, hook) in repo.pre_index_hooks.iter().enumerate() {
             let hook_index = idx + 1;
             match hooks::run_hook(
+                &self.cfg.global.shell,
                 hook,
                 "pre",
                 hook_index,
@@ -632,6 +633,7 @@ impl Scheduler {
         for (idx, hook) in repo.post_upload_hooks.iter().enumerate() {
             let hook_index = idx + 1;
             match hooks::run_hook(
+                &self.cfg.global.shell,
                 hook,
                 "post",
                 hook_index,
@@ -747,6 +749,7 @@ impl Scheduler {
         );
 
         match hooks::run_hook(
+            &self.cfg.global.shell,
             hook,
             "global_finish",
             1,