[lmi-commits] [lmi] master 28e7e58 5/5: Install and verify native java tools in chroot

[Greg Chicares]

branch: master
commit 28e7e58ac9c4c973f9e179ad1fad925feae84e90
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Install and verify native java tools in chroot
---
 README.schroot |    2 +-
 install_msw.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.schroot b/README.schroot
index e0b85bf..ac79a23 100644
--- a/README.schroot
+++ b/README.schroot
@@ -80,7 +80,7 @@ ln -s /bin/true /usr/bin/ischroot
 
 apt-get update
 apt-get --assume-yes install g++-mingw-w64-i686 automake libtool make \
- pkg-config git zsh bzip2 unzip sudo wine \
+ pkg-config git zsh bzip2 unzip sudo wine default-jre fop jing trang \
  >cross-lmi-apt-get-log 2>&1
 
 # Don't worry about messages like these:
diff --git a/install_msw.sh b/install_msw.sh
index 8c2de59..788b533 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -103,10 +103,10 @@ then
     #   https://lists.nongnu.org/archive/html/lmi/2016-01/msg00092.html
     export CYGCHECK=`cygpath --mixed /usr/bin/cygcheck`
     cmd /c $CYGCHECK -s -v -r | tr --delete '\r'
-
-    java -version
 fi
 
+java -version
+
 mkdir --parents /opt/lmi/src
 cd /opt/lmi/src