From 131d3c7b7869f56e132d1d5e69198c58014e263d Mon Sep 17 00:00:00 2001
From: Ivan Smolin <ivan.smolin@touchin.ru>
Date: Wed, 22 Jan 2020 14:12:35 +0300
Subject: [PATCH] fix swiftlint

---
 LeadKitAdditions.xcodeproj/project.pbxproj |  2 +-
 build-scripts                              |  2 +-
 download_swiftlint.sh                      | 12 ------------
 run_swiftlint.sh                           | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 download_swiftlint.sh
 create mode 100644 run_swiftlint.sh

diff --git a/LeadKitAdditions.xcodeproj/project.pbxproj b/LeadKitAdditions.xcodeproj/project.pbxproj
index 9a328f7..186993c 100644
--- a/LeadKitAdditions.xcodeproj/project.pbxproj
+++ b/LeadKitAdditions.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "CONFIG_PATH=${PROJECT_DIR}/build-scripts/xcode/.swiftlint.yml\n\n. ${PROJECT_DIR}/download_swiftlint.sh\n\n${PROJECT_DIR}/Downloads/swiftlint autocorrect --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH} && swiftlint --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH}\n";
+			shellScript = ". run_swiftlint.sh\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/build-scripts b/build-scripts
index 54935bb..1f83bf5 160000
--- a/build-scripts
+++ b/build-scripts
@@ -1 +1 @@
-Subproject commit 54935bbe26063cdf04e72b8cb76d61c727ff99a7
+Subproject commit 1f83bf5d08bbc2c2346141621a42b2d2e0dd6517
diff --git a/download_swiftlint.sh b/download_swiftlint.sh
deleted file mode 100644
index b731b36..0000000
--- a/download_swiftlint.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-SWIFTLINT_VERSION=0.31.0
-SWIFTLINT_PORTABLE_FILENAME=portable_swiftlint.zip
-
-SWIFTLINT_PORTABLE_URL=https://github.com/realm/SwiftLint/releases/download/${SWIFTLINT_VERSION}/${SWIFTLINT_PORTABLE_FILENAME}
-
-rm ${PROJECT_DIR}/Downloads/${SWIFTLINT_PORTABLE_FILENAME}
-
-. ${PROJECT_DIR}/build-scripts/xcode/aux_scripts/download_file.sh ${SWIFTLINT_PORTABLE_FILENAME} ${SWIFTLINT_PORTABLE_URL}
-
-cd Downloads && unzip -o ${SWIFTLINT_PORTABLE_FILENAME}
\ No newline at end of file
diff --git a/run_swiftlint.sh b/run_swiftlint.sh
new file mode 100644
index 0000000..01c1db0
--- /dev/null
+++ b/run_swiftlint.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+readonly CONFIG_PATH=${PROJECT_DIR}/build-scripts/xcode/.swiftlint.yml
+
+readonly SWIFTLINT_VERSION=0.31.0
+readonly SWIFTLINT_PORTABLE_FILENAME=portable_swiftlint.zip
+
+readonly SWIFTLINT_PORTABLE_URL=https://github.com/realm/SwiftLint/releases/download/${SWIFTLINT_VERSION}/${SWIFTLINT_PORTABLE_FILENAME}
+
+. build-scripts/xcode/aux_scripts/download_file.sh ${SWIFTLINT_PORTABLE_FILENAME} ${SWIFTLINT_PORTABLE_URL} Downloads --remove-cached
+
+cd Downloads && unzip -o ${SWIFTLINT_PORTABLE_FILENAME}
+
+${PROJECT_DIR}/Downloads/swiftlint autocorrect --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH} && ${PROJECT_DIR}/Downloads/swiftlint --path ${PROJECT_DIR}/Sources --config ${CONFIG_PATH}
\ No newline at end of file