[lmi-commits] [lmi] master 254c72cf 2/2: Tidy up a couple of fardel commands

[Greg Chicares]

branch: master
commit 254c72cf39805bcf6fd80be0cf60643d86f5b0bf
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Tidy up a couple of fardel commands
    
    When no other command is echoed, 'printf' shouldn't be, either. Echoing
    this line in particular would show JDNs, which aren't meant to be read
    by humans.
    
    Used '--auto-compress' to avoid specifying 'bzip2' compression twice.
    
    Incidentally, compressed sizes are:
      70113052 /opt/lmi/fardels/lmi-20220704T2048Z.tar.bz2
      47264416 /opt/lmi/fardels/lmi-20220704T2048Z.tar.xz
      71679148 /opt/lmi/fardels/lmi-20220704T2048Z.zip
    
    Clearly 'xz' compresses better, but 'bzip2' compression will continue
    to be used in a corporate msw environment where tarballs are extracted
    by a tangle of ancient scripts that it is better not to touch.
    
    The '.zip' format is used for publication on savannah because it is
    conventional for msw, but not for internal distribution because it is
    not necessarily handled correctly in corporations, where many more files
    are subject to md5 validation and "correcting" lmi's '\n' EOL indicators
    causes validation to fail.
---
 workhorse.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index 354dd7b4..462eb694 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -694,11 +694,11 @@ wrap_fardel:
        @$(INSTALL) -m 0664 $(datadir)/group_quote_banner.png .
        @$(INSTALL) -m 0775 $(fardel_binaries) .
        @$(INSTALL) -m 0664 $(fardel_files) .
-       printf "$(j1) $(j2)" >expiry
+       @printf "$(j1) $(j2)" >expiry
        @$(MD5SUM) --binary $(fardel_checksummed_files) >validated.md5
        @$(PERFORM) $(bindir)/generate_passkey$(EXEEXT) > passkey
        @$(TAR) \
-         --bzip2 \
+         --auto-compress \
          --create \
          --directory=$(fardel_root) \
          --file=$(fardel_root)/$(fardel_name).tar.bz2 \