From 7a9949fc5e1d61102a00102151c2fcd7c0aab544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Fri, 26 Aug 2022 18:23:23 +0200 Subject: [PATCH] Hook scripts must end in .sh, FreeBSD packaging - Only hook scripts that end in .sh are executed. - When packaging for FreeBSD, batch-viz.sh and visualizations.sh are installed with a .sample extension. Addresses #137 --- lib/model.ml | 2 +- packaging/FreeBSD/create_package.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/model.ml b/lib/model.ml index 3e796ba..1a883e2 100644 --- a/lib/model.ml +++ b/lib/model.ml @@ -450,7 +450,7 @@ let add_build let rec go () = let next_file = Unix.readdir dh in let file = Fpath.(dir / next_file) in - if is_executable file then + if is_executable file && Fpath.has_ext ".sh" file then ignore (Sys.command (Fpath.to_string file ^ " " ^ args ^ " &")); go () in diff --git a/packaging/FreeBSD/create_package.sh b/packaging/FreeBSD/create_package.sh index b12e373..54e0b95 100755 --- a/packaging/FreeBSD/create_package.sh +++ b/packaging/FreeBSD/create_package.sh @@ -35,8 +35,8 @@ install -U "$bdir/builder-migrations" "$sbindir/builder-migrations" install -U "$bdir/builder-db" "$sbindir/builder-db" # stage visualization scripts -install -U "$basedir/packaging/batch-viz.sh" "$confdir/batch-viz.sh" -install -U "$basedir/packaging/visualizations.sh" "$confdir/upload-hooks/visualizations.sh" +install -U "$basedir/packaging/batch-viz.sh" "$confdir/batch-viz.sh.sample" +install -U "$basedir/packaging/visualizations.sh" "$confdir/upload-hooks/visualizations.sh.sample" # example repo scripts install -U "$basedir/packaging/dpkg-repo.sh" "$sharedir/dpkg-repo.sh"