Merge branch 'fixes' into 'main'

fixes for Ambient

See merge request obnam/summain!36

3 files changed, 16 insertions, 14 deletions

diff --git a/check b/check
index 24b73fe..237df0d 100755
--- a/check
+++ b/check
@@ -6,32 +6,38 @@ set -euo pipefail
 
 quiet=-q
 hideok=
+offline=
+
 if command -v chronic >/dev/null; then
 	hideok=chronic
 fi
 
-if [ "$#" -gt 0 ]; then
+while [ "$#" -gt 0 ]; do
 	case "$1" in
-	verbose | -v | --verbose)
+	-v | --verbose)
 		quiet=
 		hideok=
+		shift
+		;;
+	--offline)
+		offline=--offline
+		shift
 		;;
 	esac
-fi
+done
 
 got_cargo_cmd() {
 	cargo --list | grep " $1 " >/dev/null
 }
 
 # shellcheck disable=2086
-cargo build --all-targets $quiet
+cargo build $offline --all-targets $quiet
 
 # shellcheck disable=2086
-got_cargo_cmd clippy && cargo clippy $quiet
+got_cargo_cmd clippy && cargo clippy $offline $quiet
 got_cargo_cmd fmt && cargo fmt -- --check
 
 subplot docgen summain.subplot -o summain.html
-subplot docgen summain.subplot -o summain.pdf
 
 subplot codegen summain.subplot -o test.py
 rm -f test.log
diff --git a/debian/control b/debian/control
index c3d39a4..d177b69 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,7 @@ Build-Depends:
  build-essential,
  dh-cargo,
  python3,
- subplot,
- texlive-fonts-recommended,
- texlive-latex-base,
- texlive-latex-recommended
+ subplot
 Homepage: https://summain.liw.fi/
 
 Package: summain
diff --git a/debian/rules b/debian/rules
index ceff6bc..8f54ee9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,8 @@ override_dh_auto_build:
 	true
 
 override_dh_auto_install:
-	cargo install --path=. --root=debian/summain
-	rm -f debian/summain/.crates.toml
-	rm -f debian/summain/.crates2.json
+	cargo install --offline --path=. --root=debian/summain
+	rm -f debian/*/.crates*
 
 override_dh_auto_test:
-	./check
+	./check --offline