---

yaml
---
r: 153343
b: refs/heads/try2
c: 9641856
h: refs/heads/master
i:
  153341: 252513f
  153339: 3f54e92
  153335: 5da949b
  153327: 24d97df
  153311: 5f710f7
  153279: 97da34d
  153215: 4beff38
  153087: dd4e80a
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5ee270a148f95c35b14872fc6497e66c11177ea3
+refs/heads/try2: 96418569641eecbb5d87a790ce4300658d46fd46
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/install.sh

@@ -293,11 +293,9 @@ elif [ "$CFG_OSTYPE" = "Darwin" ]
 then
     CFG_LD_PATH_VAR=DYLD_LIBRARY_PATH
     CFG_OLD_LD_PATH_VAR=$DYLD_LIBRARY_PATH
-    UNIX=1
 else
     CFG_LD_PATH_VAR=LD_LIBRARY_PATH
     CFG_OLD_LD_PATH_VAR=$LD_LIBRARY_PATH
-    UNIX=1
 fi
 
 flag uninstall "only uninstall from the installation prefix"
@@ -469,13 +467,13 @@ while read p; do
 done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
 
 # Run ldconfig to make dynamic libraries available to the linker
-if [ $UNIX -eq 1 ]
+if [ "$CFG_OSTYPE" = "Linux" ]
     then
     ldconfig
     if [ $? -ne 0 ]
     then
-	warn "failed to run ldconfig."
-	warn "this may happen when not installing as root, in which case you know what you are doing and it's probably fine."
+        warn "failed to run ldconfig."
+        warn "this may happen when not installing as root and may be fine"
     fi
 fi