[lmi-commits] [lmi] master 76d7a94 4/4: In msw install script, try to accommodate an existing installation

[Greg Chicares]

branch: master
commit 76d7a941da377056c420ecbe9743f56204b85c8a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    In msw install script, try to accommodate an existing installation
    
    Changed the script to move aside any existing source directory and
    to invoke 'make clean'. If the script was rerun, this command:
      git clone http://git.savannah.nongnu.org/r/lmi.git
    formerly failed, emitting this diagnostic to the log:
      fatal: \
      destination path 'lmi' already exists and is not an empty directory.
    but continued, and the diagnostic was too easy to overlook. For the
    'make clean' rationale, see:
      http://lists.nongnu.org/archive/html/lmi/2017-08/msg00038.html
---
 install_msw.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install_msw.sh b/install_msw.sh
index b7e9c83..a241ec4 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -113,6 +113,10 @@ java -version
 mkdir --parents /opt/lmi/src
 cd /opt/lmi/src
 
+# Preserve any preexisting source directory, moving it aside so that
+# 'git clone' will install a pristine working copy.
+mv lmi lmi-moved-$stamp0
+
 # Favor http over git's own protocol only because corporate firewalls
 # in lmi's target industry tend to block the latter.
 git clone http://git.savannah.nongnu.org/r/lmi.git
@@ -180,6 +184,7 @@ export 
minimal_path=/opt/lmi/local/bin:/opt/lmi/local/lib:/usr/bin:/bin:/usr/sbi
 
 make $coefficiency --output-sync=recurse PATH=$minimal_path wx_config_check
 make $coefficiency --output-sync=recurse PATH=$minimal_path show_flags
+make $coefficiency --output-sync=recurse PATH=$minimal_path clean
 make $coefficiency --output-sync=recurse PATH=$minimal_path install
 
 if [ "CYGWIN" = "$platform" ]