[lmi-commits] [lmi] odd/multiarch 923023d 09/16: Use 'set_arch.sh' instead of commented-out blocks of code

[Greg Chicares]

branch: odd/multiarch
commit 923023d86ebec512364ce69cce61de684c259c83
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Use 'set_arch.sh' instead of commented-out blocks of code
---
 install_msw.sh       | 23 -----------------------
 nychthemeral_test.sh | 24 +-----------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index 3615f67..e3d6a6b 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -212,29 +212,6 @@ make $coefficiency --output-sync=recurse -f 
install_libxml2_libxslt.make
 
 find /cache_for_lmi/downloads -type f | xargs md5sum
 
-#export         PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$PATH
-#export 
minimal_path=/opt/lmi/local/bin:/opt/lmi/local/lib:/usr/bin:/bin:/usr/sbin:/sbin
-
-# USE SYMLINKS INSTEAD
-#exec_prefix=/opt/lmi/"$LMI_HOST"
-#localbindir="$exec_prefix"/local/bin
-#locallibdir="$exec_prefix"/local/lib
-#
-#export         PATH="$localbindir":"$locallibdir":"$PATH"
-#export 
minimal_path="$localbindir":"$locallibdir":/usr/bin:/bin:/usr/sbin:/sbin
-
-# USE SYMLINKS INSTEAD
-# condition should be cross compilation, not !cygwin
-#if [ "Cygwin" != "$platform" ]
-#then
-#   extrabindir=/opt/lmi/third_party/bin
-# double quotes inside double quotes--wrong?
-#   w0="$(winepath -w "$localbindir" | sed -e's/\\/\\\\/g')"
-#   w1="$(winepath -w "$locallibdir" | sed -e's/\\/\\\\/g')"
-#   w2="$(winepath -w "$extrabindir" | sed -e's/\\/\\\\/g')"
-#   export WINEPATH="$w0;$w1;$w2"
-#fi
-
 echo "$PATH"
 . ./set_arch.sh
 echo "$PATH"
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index cb783f9..70cf0ac 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -45,29 +45,7 @@ set -e
 # provides no convenient alternative):
 setopt PIPE_FAIL
 
-# Don't manipulate paths--use symlinks instead.
-cat >/dev/null <<SUPPRESSED
-# --- DISTRESSINGLY COPIED BLOCK
-# INSTEAD TRY SYMLINKS?
-exec_prefix=/opt/lmi/"$LMI_HOST"
-localbindir="$exec_prefix"/local/bin
-locallibdir="$exec_prefix"/local/lib
-
-export         PATH="$localbindir":"$locallibdir":"$PATH"
-export minimal_path="$localbindir":"$locallibdir":/usr/bin:/bin:/usr/sbin:/sbin
-
-case "$LMI_BUILD" in
-    (*-*-linux*)
-        extrabindir=/opt/lmi/third_party/bin
-# double quotes inside double quotes--wrong?
-        w0="$(winepath -w "$localbindir" | sed -e's/\\/\\\\/g')"
-        w1="$(winepath -w "$locallibdir" | sed -e's/\\/\\\\/g')"
-        w2="$(winepath -w "$extrabindir" | sed -e's/\\/\\\\/g')"
-        export WINEPATH="$w0;$w1:$w2"
-        ;;
-esac
-# --- DISTRESSINGLY COPIED BLOCK
-SUPPRESSED
+. ./set_arch.sh
 
 case "$LMI_BUILD" in
     (*-*-linux*)