From fc734dc2cd63164e30e82747d93cfb5fe8d8d6c6 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 2 Aug 2021 15:44:38 +0200 Subject: [PATCH] improve packaging: use sh -ex --- builder-web.opam | 4 ++-- packaging/FreeBSD/create_package.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder-web.opam b/builder-web.opam index 813a144..68cb62a 100644 --- a/builder-web.opam +++ b/builder-web.opam @@ -10,8 +10,8 @@ build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} - ["sh" "packaging/FreeBSD/create_package.sh"] {os = "freebsd"} - ["sh" "packaging/debian/create_package.sh"] {os-family = "debian"} + ["sh" "-ex" "packaging/FreeBSD/create_package.sh"] {os = "freebsd"} + ["sh" "-ex" "packaging/debian/create_package.sh"] {os-family = "debian"} ] depends: [ diff --git a/packaging/FreeBSD/create_package.sh b/packaging/FreeBSD/create_package.sh index 23b7b54..28f4159 100755 --- a/packaging/FreeBSD/create_package.sh +++ b/packaging/FreeBSD/create_package.sh @@ -49,6 +49,6 @@ sed -e "s:%%FLATSIZE%%:${flatsize}:" "$pdir/MANIFEST" > "$manifest" export SOURCE_DATE_EPOCH=$(git log -1 --pretty=format:%ct) pkg create -r "$rootdir" -M "$manifest" -o $basedir/ -mv $basedir/builder_web-*.txz $basedir/builder_web.txz -echo 'bin: [ "builder_web.txz" ]' > $basedir/builder-web.install +mv $basedir/builder_web-*.pkg $basedir/builder_web.pkg +echo 'bin: [ "builder_web.pkg" ]' > $basedir/builder-web.install echo 'doc: [ "README.md" ]' >> $basedir/builder-web.install