[lmi-commits] [lmi] master 97a8cf8 6/6: Fix an observed problem

[Greg Chicares]

branch: master
commit 97a8cf84fcf597290c364097ddf6ac8f529d5a7c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fix an observed problem
    
    After rebuilding thus:
      $cd /opt/lmi/src/lmi
      $make eviscerate
      $rm -rf /opt/lmi/bin
      $logfile=log-`date -u +'%Y%m%dT%H%MZ'`; \
       echo "Log file is '$logfile.tar.xz'."; \
       ./install_msw.sh >$logfile 2>&1; \
       tar -cJf $logfile.tar.xz $logfile; mv ${logfile}* ..
      $git diff --no-index --color=always --color-moved=plain \
       ../log-20190519T1536Z ../log-20190519T2007Z \
       |sed -e's/^.\[3[12]m/&ZZZ/' |less -RS
    the resulting log was observed to contain:
      Error: Nonce directory '/opt/lmi/zzz/mingw-ad_hoc/ad_hoc' already \
       exists.
      Probably it is left over from a previous failure.
      Just remove it unless you're sure you want whatever files
      it might contain.
      make: *** [install_mingw.make:114: initial_setup] Error 1
    Therefore, made evisceration more severe (the rebuild would have
    succeeded if '/opt/lmi/zzz' had been removed at the beginning)
    and automatic (in the particular case of rebuilding in the lmi
    source directory).
    
    Added '/opt/lmi/bin/' to the list of directories to be eviscerated.
    Do not store valuable files there, or twiddle their permissions so
    that 'rm --force' cannot remove them.
---
 GNUmakefile    | 2 ++
 install_msw.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/GNUmakefile b/GNUmakefile
index 86664a5..d8c9eaf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -372,8 +372,10 @@ raze: source_clean
 
 .PHONY: eviscerate
 eviscerate: source_clean
+       -$(RM) --force --recursive $(prefix)/bin
        -$(RM) --force --recursive $(prefix)/local
        -$(RM) --force --recursive $(prefix)/third_party
+       -$(RM) --force --recursive $(prefix)/zzz
        -$(RM) --force --recursive $(prefix)/gcc_i686-w64-mingw32
        -$(RM) --force --recursive $(prefix)/gcc_x86_64-w64-mingw32
        -$(RM) --force --recursive $(prefix)/gcc_x86_64-pc-linux-gnu
diff --git a/install_msw.sh b/install_msw.sh
index 275da78..98e2a96 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -134,6 +134,8 @@ if [ "/opt/lmi/src/lmi" = "$PWD" ]
 then
     inhibit_git_clone=1
     printf 'Running in lmi srcdir, so inhibiting git clone.\n'
+    printf 'Eviscerating...\n'
+    make eviscerate || true
 fi
 
 mkdir --parents /opt/lmi/src