[lmi-commits] [lmi] master bb9e876 1/2: Work around a 'schroot --preserve-environment' issue

[Greg Chicares]

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

    Work around a 'schroot --preserve-environment' issue
    
    After
      schroot --preserve-environment --user="${NORMAL_USER}"
    the value of $HOME is '/root'. This suggests that using '--user' and
    '--preserve-environment' together isn't such a good idea after all,
    and that using schroot's startup scripts is more promising.
---
 lmi_setup_40.sh | 3 +++
 lmi_setup_41.sh | 3 +++
 lmi_setup_42.sh | 3 +++
 lmi_setup_43.sh | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/lmi_setup_40.sh b/lmi_setup_40.sh
index ab683ce..fc83e48 100755
--- a/lmi_setup_40.sh
+++ b/lmi_setup_40.sh
@@ -28,6 +28,9 @@ set -vx
 assert_not_su
 assert_chrooted
 
+# Kludge:
+HOME=/home/"${NORMAL_USER}"
+
 # Initialize wine. See:
 #   https://lists.nongnu.org/archive/html/lmi/2016-10/msg00002.html
 WINEDLLOVERRIDES=mscoree=d wine wineboot
diff --git a/lmi_setup_41.sh b/lmi_setup_41.sh
index 0126bbe..68454c2 100755
--- a/lmi_setup_41.sh
+++ b/lmi_setup_41.sh
@@ -28,6 +28,9 @@ set -vx
 assert_not_su
 assert_chrooted
 
+# Kludge:
+HOME=/home/"${NORMAL_USER}"
+
 # 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
diff --git a/lmi_setup_42.sh b/lmi_setup_42.sh
index 70b1e94..40d5f05 100755
--- a/lmi_setup_42.sh
+++ b/lmi_setup_42.sh
@@ -28,6 +28,9 @@ set -vx
 assert_not_su
 assert_chrooted
 
+# Kludge:
+HOME=/home/"${NORMAL_USER}"
+
 # Install lmi for wine.
 
 cd ~ || { printf 'failed: cd\n'; exit 3; }
diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index 038f46f..dd6df8e 100755
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -28,6 +28,9 @@ set -vx
 assert_not_su
 assert_chrooted
 
+# Kludge:
+HOME=/home/"${NORMAL_USER}"
+
 # Symlink the repository's hooks/ directory:
 cd /opt/lmi/src/lmi || { printf 'failed: cd\n'; exit 3; }
 mv .git/hooks .git/hooks-orig