From 52a8c4a40163679c99f76fae86de32de2e2dc754 Mon Sep 17 00:00:00 2001
From: Mingshen Sun <bob@mssun.me>
Date: Tue, 29 Dec 2020 19:44:00 -0800
Subject: [PATCH] Move all scripts to the scripts dir

---
 .github/workflows/deploying.yml                |  4 ++--
 README.md                                      |  2 +-
 fastlane/Fastfile                              | 10 +++++++---
 gopenpgp_build.sh => scripts/gopenpgp_build.sh |  0
 wcarthage => scripts/wcarthage                 |  0
 5 files changed, 10 insertions(+), 6 deletions(-)
 rename gopenpgp_build.sh => scripts/gopenpgp_build.sh (100%)
 rename wcarthage => scripts/wcarthage (100%)

diff --git a/.github/workflows/deploying.yml b/.github/workflows/deploying.yml
index b21f353..238dc66 100644
--- a/.github/workflows/deploying.yml
+++ b/.github/workflows/deploying.yml
@@ -22,8 +22,8 @@ jobs:
         export PATH="/usr/local/opt/go@1.14/bin:$PATH"
         bundle install
         bundle exec pod install
-        ./wcarthage bootstrap --platform iOS
-        ./gopenpgp_build.sh
+        ./scripts/wcarthage bootstrap --platform iOS
+        ./scripts/gopenpgp_build.sh
     - name: Test
       run: bundle exec fastlane test
     - name: Deploy
diff --git a/README.md b/README.md
index 03b10da..661e05f 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ For more, please read the [wiki page](https://github.com/mssun/passforios/wiki).
 ## Building Pass for iOS
 
 1. Install libtool, automake, cmake, carthage, cocoapods, and go: `brew install libtool automake cmake carthage cocoapods go@1.14 swiftlint swiftformat`. At the moment, the project does not build with current version of go (1.15). Use 1.14
-2. Install dependencies via Carthage in the project root directory: `./wcarthage update` then `./wcarthage bootstrap --platform iOS`. This may take some time.
+2. Install dependencies via Carthage in the project root directory: `./scripts/wcarthage update` then `./scripts/wcarthage bootstrap --platform iOS`. This may take some time.
 3. Run `./gopenpgp_build.sh` to build go dependencies.
 4. Install dependencies via CocoaPods in the project root directory: `pod install`.
 5. Open the `pass.xcworkspace` file in Xcode.
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5266fd9..48f2c46 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -3,7 +3,7 @@ default_platform :ios
 lane :prepare do
   cocoapods
   carthage(cache_builds: true, platform: "iOS")
-  sh "./gopenpgp_build.sh"
+  sh "./scripts/gopenpgp_build.sh"
 end
 
 lane :reset_build_number do
@@ -80,7 +80,9 @@ platform :ios do
       timeout: 3600,
       add_to_search_list: true
     )
-    match_appstore_beta
+    if is_ci?
+      match_appstore_beta
+    end
     increment_build_number(
       build_number: latest_testflight_build_number(
         version: get_version_number(target: "pass"),
@@ -125,7 +127,9 @@ platform :ios do
       timeout: 3600,
       add_to_search_list: true
     )
-    match_appstore
+    if is_ci?
+      match_appstore
+    end
     increment_build_number(
       build_number: latest_testflight_build_number(
         version: get_version_number(target: "pass"),
diff --git a/gopenpgp_build.sh b/scripts/gopenpgp_build.sh
similarity index 100%
rename from gopenpgp_build.sh
rename to scripts/gopenpgp_build.sh
diff --git a/wcarthage b/scripts/wcarthage
similarity index 100%
rename from wcarthage
rename to scripts/wcarthage