Updated install script.

skylab-inc · Nov 20, 2017 · f0183f5 · f0183f5
1 parent 2c37d6c
commit f0183f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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`;