Skip to content

Commit 90cf0ed

Browse files
committed
Clean up configure file
Following `shellcheck` advice.
1 parent 0737ca9 commit 90cf0ed

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

configure

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ fi
533533
missingtools=false
534534

535535
echo "Testing Coq... " | tr -d '\n'
536-
coq_ver=$(${COQBIN}coqc --print-version 2>/dev/null | tr -d '\r' | cut -d' ' -f1)
536+
coq_ver=$("${COQBIN}"coqc --print-version 2>/dev/null | tr -d '\r' | cut -d' ' -f1)
537537
case "$coq_ver" in
538538
8.15.0|8.15.1|8.15.2|8.16.0|8.16.1|8.17.0|8.17.1|8.18.0|8.19.0|8.19.1|8.19.2|8.20.0|8.20.1|9.0.0|9.1.0|9.1.1)
539539
echo "version $coq_ver -- good!";;
@@ -547,7 +547,7 @@ case "$coq_ver" in
547547
fi;;
548548
"")
549549
echo "NOT FOUND"
550-
rocq_ver=$(${COQBIN}rocq --print-version 2>/dev/null | tr -d '\r' | cut -d' ' -f1)
550+
rocq_ver=$("${COQBIN}"rocq --print-version 2>/dev/null | tr -d '\r' | cut -d' ' -f1)
551551
case "$rocq_ver" in
552552
"") echo "Error: make sure Coq is installed.";;
553553
*) echo "Rocq prover version $rocq_ver found."
@@ -557,7 +557,7 @@ case "$coq_ver" in
557557
esac
558558

559559
echo "Testing OCaml... " | tr -d '\n'
560-
ocaml_ver=`ocamlc -version 2>/dev/null | tr -d '\r'`
560+
ocaml_ver=$(ocamlc -version 2>/dev/null | tr -d '\r')
561561
case "$ocaml_ver" in
562562
4.0[5-9].*|4.1?.*)
563563
echo "version $ocaml_ver -- good!";;
@@ -575,7 +575,7 @@ case "$ocaml_ver" in
575575
esac
576576

577577
echo "Testing OCaml native-code compiler... " | tr -d '\n'
578-
ocamlopt_ver=`ocamlopt -version 2>/dev/null | tr -d '\r'`
578+
ocamlopt_ver=$(ocamlopt -version 2>/dev/null | tr -d '\r')
579579
if test "$ocamlopt_ver" = "$ocaml_ver"; then
580580
echo "yes"
581581
ocaml_native_comp=true
@@ -585,7 +585,7 @@ else
585585
fi
586586

587587
echo "Testing OCaml .opt compilers... " | tr -d '\n'
588-
ocamlopt_opt_ver=`ocamlopt.opt -version 2>/dev/null | tr -d '\r'`
588+
ocamlopt_opt_ver=$(ocamlopt.opt -version 2>/dev/null | tr -d '\r')
589589
if test "$ocamlopt_opt_ver" = "$ocaml_ver"; then
590590
echo "yes"
591591
ocaml_opt_comp=true
@@ -596,7 +596,7 @@ fi
596596

597597
MENHIR_REQUIRED=20200624
598598
echo "Testing Menhir... " | tr -d '\n'
599-
menhir_ver=`menhir --version 2>/dev/null | sed -n -e 's/^.*version \([0-9]*\).*$/\1/p'`
599+
menhir_ver=$(menhir --version 2>/dev/null | sed -n -e 's/^.*version \([0-9]*\).*$/\1/p')
600600
case "$menhir_ver" in
601601
20[0-9][0-9][0-9][0-9][0-9][0-9])
602602
if test "$menhir_ver" -ge $MENHIR_REQUIRED; then
@@ -625,7 +625,7 @@ esac
625625
echo "Testing GNU make... " | tr -d '\n'
626626
make=''
627627
for mk in make gmake gnumake; do
628-
make_ver=`$mk -v 2>/dev/null | tr -d '\r' | head -1 | sed -n -e 's/^GNU Make //p'`
628+
make_ver=$($mk -v 2>/dev/null | tr -d '\r' | head -1 | sed -n -e 's/^GNU Make //p')
629629
case "$make_ver" in
630630
3.8*|3.9*|[4-9].*)
631631
echo "version $make_ver (command '$mk') -- good!"
@@ -915,14 +915,14 @@ EOF
915915
fi
916916

917917
cat <<EOF
918-
Man pages installed in........ $(expandprefix $mandir)
918+
Man pages installed in........ $(expandprefix "$mandir")
919919
Standard headers provided..... $has_standard_headers
920-
Standard headers installed in. $(expandprefix $libdir)/include
920+
Standard headers installed in. $(expandprefix "$libdir")/include
921921
EOF
922922

923923
if $install_coqdev; then
924924
cat <<EOF
925-
Coq development installed in.. $(expandprefix $coqdevdir)
925+
Coq development installed in.. $(expandprefix "$coqdevdir")
926926
EOF
927927
else
928928
cat <<EOF

0 commit comments

Comments
 (0)