Commit 3760bac7 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

Made script more robust.

git-svn-id: file:///svn/toku/tokudb@18938 c7de825b-a66e-492c-adef-691d508d4ae1
parent bdebc7d2
...@@ -36,7 +36,7 @@ echo ...@@ -36,7 +36,7 @@ echo
( (
cd amd64 && cd amd64 &&
if ! diff -q Cygwin.bat /cygdrive/c/cygwin/Cygwin.bat > /dev/null; then if ! diff -q Cygwin.bat /cygdrive/c/cygwin/Cygwin.bat > /dev/null; then
cp Cygwin.bat /cygdrive/c/cygwin/ cp Cygwin.bat /cygdrive/c/cygwin/ || { echo Failed Cygwin.bat; exit 1; }
fi fi
) )
if ! grep 'export CC=' ~/.bashrc > /dev/null; then if ! grep 'export CC=' ~/.bashrc > /dev/null; then
...@@ -50,18 +50,18 @@ fi ...@@ -50,18 +50,18 @@ fi
#cygwin link is in the way #cygwin link is in the way
if test -e /usr/bin/link; then if test -e /usr/bin/link; then
mv /usr/bin/link /usr/bin/link_DISABLED mv /usr/bin/link /usr/bin/link_DISABLED || { echo Failed changing link; exit 1; }
fi fi
#cygwin cmake is in the way #cygwin cmake is in the way
if test -e /usr/bin/cmake; then if test -e /usr/bin/cmake; then
mv /usr/bin/cmake /usr/bin/cmake_DISABLED mv /usr/bin/cmake /usr/bin/cmake_DISABLED || { echo Failed changing link; exit 1; }
fi fi
#Set up aliases #Set up aliases
( cd amd64/symlinks && cp -d * /usr/local/bin/ ) ( cd amd64/symlinks && cp -d * /usr/local/bin/ || { echo Failed copying link; exit 1; } )
#Copy nightly script. #Copy nightly script.
cp -u nightly.sh ~/ cp -u nightly.sh ~/ || { echo Failed copying nightly.sh; exit 1; }
echo You can now install the intel compiler. echo You can now install the intel compiler.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment