[lmi-commits] [lmi] master dc58a57 4/4: Symlink directories used by lmi, for multiarch configuration

[Greg Chicares]

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

    Symlink directories used by lmi, for multiarch configuration
---
 README.schroot | 27 +++++++++++++++++++++++++++
 install_msw.sh |  8 ++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/README.schroot b/README.schroot
index f39854f..fd6f4ca 100644
--- a/README.schroot
+++ b/README.schroot
@@ -127,6 +127,10 @@ adduser --gid=1000 --uid=1000 greg
 
 mkdir -p /opt/lmi
 chown greg:greg /opt/lmi
+mkdir -p /etc/opt/lmi
+chown greg:greg /etc/opt/lmi
+mkdir -p /var/opt/lmi
+chown greg:greg /var/opt/lmi
 mkdir -p /cache_for_lmi
 chown greg:greg /cache_for_lmi
 
@@ -280,6 +284,29 @@ WINEDLLOVERRIDES=mscoree=d wine wineboot
 # Install java.
 wine /cache_for_lmi/jre-1_5_0-windows-i586.exe
 
+# Symlink directories used by lmi, so that both native and wine
+# builds use the same directories and can share the same
+# architecture-independent 'configurable_settings.xml'--much like the
+# "identity mount" technique used with cygwin. See:
+#   http://lists.nongnu.org/archive/html/lmi/2017-05/msg00018.html
+
+mkdir -p ~/.wine/drive_c/users/greg/opt/
+pushd ~/.wine/drive_c/users/greg/opt/
+ln --symbolic --relative --force --no-dereference /opt/lmi/ ./lmi
+popd
+
+mkdir -p ~/.wine/drive_c/users/greg/etc/opt/
+pushd ~/.wine/drive_c/users/greg/etc/opt/
+ln --symbolic --relative --force --no-dereference /etc/opt/lmi/ ./lmi
+popd
+
+mkdir -p ~/.wine/drive_c/users/greg/var/opt/
+pushd ~/.wine/drive_c/users/greg/var/opt/
+ln --symbolic --relative --force --no-dereference /var/opt/lmi/ ./lmi
+popd
+
+# Install lmi for wine.
+
 wget -N 'http://git.savannah.gnu.org/cgit/lmi.git/plain/install_msw.sh'
 chmod +x install_msw.sh
 ./install_msw.sh >log 2>&1
diff --git a/install_msw.sh b/install_msw.sh
index f928c9e..1ef986e 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -219,11 +219,15 @@ cat >/opt/lmi/data/configurable_settings.xml <<EOF
 </configurable_settings>
 EOF
 
-# Use "Z:" instead of "C:" for wine.
+# Remove "C:" for wine: it designates the "wine prefix" directory.
+# "Z:" could be used instead, because that's where wine maps the
+# apparent root, but that wouldn't work with posix builds. Instead,
+# therefore, symlink the directories lmi uses as described in
+# 'README.schroot'.
 
 if [ "CYGWIN" != "$platform" ]
 then
-    sed -i /opt/lmi/data/configurable_settings.xml -e's/C:/Z:/g'
+    sed -i /opt/lmi/data/configurable_settings.xml -e's/C://g'
 fi
 
 stamp1=$(date -u +'%Y-%m-%dT%H:%M:%SZ')