From 2cbb0a97eeb4eea8ef18d59346759b20cc8fa180 Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Mon, 13 May 2019 22:31:50 +0200
Subject: Adapt CI scripts to work under swift docker image

---
 Scripts/install_swiftlint.sh | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'Scripts/install_swiftlint.sh')

diff --git a/Scripts/install_swiftlint.sh b/Scripts/install_swiftlint.sh
index 6a2f250..4b8299d 100755
--- a/Scripts/install_swiftlint.sh
+++ b/Scripts/install_swiftlint.sh
@@ -1,25 +1,11 @@
 #!/bin/bash
 
-# Taken from: https://alexplescan.com/posts/2016/03/03/setting-up-swiftlint-on-travis-ci/
-
-# Installs the SwiftLint package.
-# Tries to get the precompiled .pkg file from Github, but if that
-# fails just recompiles from source.
+# Installs SwiftLint from source (Intended to be used with
+# swift docker image)
 
 set -e
 
-SWIFTLINT_PKG_PATH="/tmp/SwiftLint.pkg"
-SWIFTLINT_PKG_URL="https://github.com/realm/SwiftLint/releases/download/0.18.1/SwiftLint.pkg"
-
-wget --output-document=$SWIFTLINT_PKG_PATH $SWIFTLINT_PKG_URL
-
-if [ -f $SWIFTLINT_PKG_PATH ]; then
-  echo "SwiftLint package exists! Installing it..."
-  sudo installer -pkg $SWIFTLINT_PKG_PATH -target /
-else
-  echo "SwiftLint package doesn't exist. Compiling from source..." &&
-  git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint &&
-  cd /tmp/SwiftLint &&
-  git submodule update --init --recursive &&
-  sudo make install
-fi
+git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint &&
+cd /tmp/SwiftLint &&
+git submodule update --init --recursive &&
+make install
-- 
cgit