From f0183f557abefb278acc4c39e3bfcf461845d080 Mon Sep 17 00:00:00 2001
From: Tyler Cloutier <cloutiertyler@aol.com>
Date: Sun, 19 Nov 2017 17:05:38 -0800
Subject: [PATCH] Updated install script.

---
 .travis.yml                       | 7 ++-----
 Scripts/TravisCI/install-swift.sh | 7 ++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6443a97..4e20209 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,8 @@ matrix:
       osx_image: xcode9.1
       sudo: required
 
-before_install:
-    - >
-      if [ $TRAVIS_OS_NAME == "linux" ]; then
-          ./Scripts/TravisCI/install-swift.sh
-      fi
+install:
+    - ./Scripts/TravisCI/install-swift.sh
 
 script:
     - swift build
diff --git a/Scripts/TravisCI/install-swift.sh b/Scripts/TravisCI/install-swift.sh
index 532b33c..6333b55 100755
--- a/Scripts/TravisCI/install-swift.sh
+++ b/Scripts/TravisCI/install-swift.sh
@@ -33,7 +33,12 @@ then
     URL="https://swift.org/builds/$RELEASE_NAME_LOWER/$OS_STRIPPED/$RELEASE_NAME_UPPER/$SWIFT_FILENAME.tar.gz";
     wget $URL
     tar -zxf "$SWIFT_FILENAME.tar.gz";
-    mv $PWD/$SWIFT_FILENAME/usr/bin/* /usr/local/bin
+    ln -s $PWD/$SWIFT_FILENAME/usr/bin/swift /usr/local/bin/swift
+    ln -s $PWD/$SWIFT_FILENAME/usr/bin/swift-build /usr/local/bin/swift-build
+    ln -s $PWD/$SWIFT_FILENAME/usr/bin/swift-build-tool /usr/local/bin/swift-build-tool
+    ln -s $PWD/$SWIFT_FILENAME/usr/bin/swift-package /usr/local/bin/swift-package
+    ln -s $PWD/$SWIFT_FILENAME/usr/bin/swift-run /usr/local/bin/swift-run
+    ln -s $PWD/$SWIFT_FILENAME/usr/bin/swift-test /usr/local/bin/swift-test
 fi
 
 echo `swift --version`;