diff --git a/.act-github/workflows/use-github-actions.yml b/.act-github/workflows/use-github-actions.yml
index 57af8dfcf..9ac151c5c 100644
--- a/.act-github/workflows/use-github-actions.yml
+++ b/.act-github/workflows/use-github-actions.yml
@@ -22,17 +22,17 @@ jobs:
                 python3-setuptools rsync silversearcher-ag strip-nondeterminism valgrind
                 vim xsltproc
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then     sudo rm
-                -fr ~/gopath ;. fc-solve/scripts/ci-before-install.bash ; fi
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then sudo rm -fr
+                ~/gopath ; . fc-solve/scripts/ci-before-install.bash ; fi
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then     sudo rm
-                -fr ~/gopath ;. fc-solve/scripts/ci-before-install.bash ; fi
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then sudo rm -fr
+                ~/gopath ; . fc-solve/scripts/ci-before-install.bash ; fi
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then . fc-solve/scripts/ci-install-stage.bash
-                ; elif test "$WHAT" = "buildproc"; then . fc-solve/scripts/ci-docker-test--install.bash
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then . fc-solve/scripts/ci-install-stage.bash
+                ; elif test "$WHAT" = "buildproc" ; then . fc-solve/scripts/ci-docker-test--install.bash
                 ; fi
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then export XML_CATALOG_FILES="/etc/xml/catalog
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then export XML_CATALOG_FILES="/etc/xml/catalog
                 $HOME/markup-validator/htdocs/sgml-lib/catalog.xml" ; bash fc-solve/scripts/run-ci-tests.bash
                 ; elif test "$WHAT" = "buildproc" ; then cd fc-solve/source/ && perl
                 ../scripts/docker-test.pl ; fi
diff --git a/.github/workflows/use-github-actions.yml b/.github/workflows/use-github-actions.yml
index 6990c8daf..fea633395 100644
--- a/.github/workflows/use-github-actions.yml
+++ b/.github/workflows/use-github-actions.yml
@@ -21,17 +21,17 @@ jobs:
                 python3-setuptools rsync silversearcher-ag strip-nondeterminism valgrind
                 vim xsltproc
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then     sudo rm
-                -fr ~/gopath ;. fc-solve/scripts/ci-before-install.bash ; fi
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then sudo rm -fr
+                ~/gopath ; . fc-solve/scripts/ci-before-install.bash ; fi
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then     sudo rm
-                -fr ~/gopath ;. fc-solve/scripts/ci-before-install.bash ; fi
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then sudo rm -fr
+                ~/gopath ; . fc-solve/scripts/ci-before-install.bash ; fi
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then . fc-solve/scripts/ci-install-stage.bash
-                ; elif test "$WHAT" = "buildproc"; then . fc-solve/scripts/ci-docker-test--install.bash
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then . fc-solve/scripts/ci-install-stage.bash
+                ; elif test "$WHAT" = "buildproc" ; then . fc-solve/scripts/ci-docker-test--install.bash
                 ; fi
         -   run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)";
-                } ; local_lib_shim ; if test "$WHAT" = "normal"; then export XML_CATALOG_FILES="/etc/xml/catalog
+                } ; local_lib_shim ; if test "$WHAT" = "normal" ; then export XML_CATALOG_FILES="/etc/xml/catalog
                 $HOME/markup-validator/htdocs/sgml-lib/catalog.xml" ; bash fc-solve/scripts/run-ci-tests.bash
                 ; elif test "$WHAT" = "buildproc" ; then cd fc-solve/source/ && perl
                 ../scripts/docker-test.pl ; fi
diff --git a/.travis.yml b/.travis.yml
index c58492910..09f1014f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,14 +49,14 @@ language: c
 python:
     - '3.6'
 before_install:
-    - if test "$WHAT" = "normal"; then     sudo rm -fr ~/gopath ;. fc-solve/scripts/ci-before-install.bash ; fi
+    - if test "$WHAT" = "normal" ; then sudo rm -fr ~/gopath ; . fc-solve/scripts/ci-before-install.bash ; fi
 install:
-    - if test "$WHAT" = "normal"; then     sudo rm -fr ~/gopath ;. fc-solve/scripts/ci-before-install.bash ; fi
-    - if test "$WHAT" = "normal"; then . fc-solve/scripts/ci-install-stage.bash ; elif test "$WHAT" = "buildproc"; then . fc-solve/scripts/ci-docker-test--install.bash ; fi
+    - if test "$WHAT" = "normal" ; then sudo rm -fr ~/gopath ; . fc-solve/scripts/ci-before-install.bash ; fi
+    - if test "$WHAT" = "normal" ; then . fc-solve/scripts/ci-install-stage.bash ; elif test "$WHAT" = "buildproc" ; then . fc-solve/scripts/ci-docker-test--install.bash ; fi
 perl:
     - "5.24"
 script:
-    - if test "$WHAT" = "normal"; then export XML_CATALOG_FILES="/etc/xml/catalog $HOME/markup-validator/htdocs/sgml-lib/catalog.xml" ; bash fc-solve/scripts/run-ci-tests.bash ; elif test "$WHAT" = "buildproc" ; then cd fc-solve/source/ && perl ../scripts/docker-test.pl ; fi
+    - if test "$WHAT" = "normal" ; then export XML_CATALOG_FILES="/etc/xml/catalog $HOME/markup-validator/htdocs/sgml-lib/catalog.xml" ; bash fc-solve/scripts/run-ci-tests.bash ; elif test "$WHAT" = "buildproc" ; then cd fc-solve/source/ && perl ../scripts/docker-test.pl ; fi
 cache:
     ccache: true
     directories: