Skip to content

Commit

Permalink
install: Fix the install.sh script to work with spaces
Browse files Browse the repository at this point in the history 
Makes it work on windows
  • Loading branch information
@brson
brson committed Sep 29, 2014
1 parent 0f75b29 commit 887da8d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/etc/install.sh
View file
Expand Up @@ -325,7 +325,7 @@ then
if [ -z "${CFG_UNINSTALL}" ]
then
msg "verifying platform can run binaries"
export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib":$CFG_OLD_LD_PATH_VAR
export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib:$CFG_OLD_LD_PATH_VAR"
"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
if [ $? -ne 0 ]
then
Expand Down Expand Up @@ -489,7 +489,7 @@ then
"${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null
if [ $? -ne 0 ]
then
export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib":$CFG_OLD_LD_PATH_VAR
export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib:$CFG_OLD_LD_PATH_VAR"
"${CFG_PREFIX}/bin/rustc" --version > /dev/null
if [ $? -ne 0 ]
then
Expand Down

5 comments on commit 887da8d

@bors
Copy link
Contributor

@bors bors commented on 887da8d Sep 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@887da8d

@bors
Copy link
Contributor

@bors bors commented on 887da8d Sep 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/wininst = 887da8d into auto

@bors
Copy link
Contributor

@bors bors commented on 887da8d Sep 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/wininst = 887da8d merged ok, testing candidate = 38015ee

@bors
Copy link
Contributor

@bors bors commented on 887da8d Sep 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1594
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1591
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1585
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1591
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1588
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1587
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1587
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1591
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1585
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1584
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1587
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1242
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1240
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1244
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/77
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/75
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/75

@bors
Copy link
Contributor

@bors bors commented on 887da8d Sep 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 38015ee

Please sign in to comment.