From 00786f2d0706a71ea06dc53f1ca8b08ef468ce79 Mon Sep 17 00:00:00 2001
From: davemachado <dave@davemachado.com>
Date: Thu, 26 Oct 2017 11:14:21 -0400
Subject: [PATCH 1/5] Add check to see if /json was changed

---
 build/main.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build/main.sh b/build/main.sh
index 795a7e63..f0e69e7b 100755
--- a/build/main.sh
+++ b/build/main.sh
@@ -18,6 +18,17 @@ else
     LINK_FILE=additions.txt
 fi
 
+echo "checking if /json was changed..."
+egrep "\+{3}\s.\/json\/" 527.diff > json.txt
+if [[$? == 0]]; then
+    echo "JSON files are auto-generated! Please do not update these files:"
+    cat json.txt
+    exit 1
+else
+    echo "/json check passed!"
+    rm json.txt
+fi
+
 echo "running format validation..."
 ./validate_format.rb $FORMAT_FILE
 if [[ $? != 0 ]]; then

From 27b320683f0f2249f30c8843fd310d1ddcc4e38c Mon Sep 17 00:00:00 2001
From: davemachado <dave@davemachado.com>
Date: Thu, 26 Oct 2017 11:17:00 -0400
Subject: [PATCH 2/5] Adding json change to test build

---
 json/entries.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/json/entries.json b/json/entries.json
index d5257989..e72d1b3a 100644
--- a/json/entries.json
+++ b/json/entries.json
@@ -2,7 +2,7 @@
     "count": 465,
     "entries": [
         {
-            "API": "Dogs",
+            "API": "Dogs are the best",
             "Auth": null,
             "Category": "Animals",
             "Description": "Based on the Stanford Dogs Dataset",

From 5e51c8b15f29e7f5a86d2e26f933bf767483e065 Mon Sep 17 00:00:00 2001
From: davemachado <dave@davemachado.com>
Date: Thu, 26 Oct 2017 11:20:45 -0400
Subject: [PATCH 3/5] Fix a stupid raw string

---
 build/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/main.sh b/build/main.sh
index f0e69e7b..dcbc6898 100755
--- a/build/main.sh
+++ b/build/main.sh
@@ -19,7 +19,7 @@ else
 fi
 
 echo "checking if /json was changed..."
-egrep "\+{3}\s.\/json\/" 527.diff > json.txt
+egrep "\+{3}\s.\/json\/" diff.txt > json.txt
 if [[$? == 0]]; then
     echo "JSON files are auto-generated! Please do not update these files:"
     cat json.txt

From e0ffb2ff62be37c6e4ecec19215b62c95e67cb1b Mon Sep 17 00:00:00 2001
From: davemachado <dave@davemachado.com>
Date: Thu, 26 Oct 2017 12:06:07 -0400
Subject: [PATCH 4/5] use verbose equals in bash

---
 build/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/main.sh b/build/main.sh
index dcbc6898..93bc2f74 100755
--- a/build/main.sh
+++ b/build/main.sh
@@ -20,7 +20,7 @@ fi
 
 echo "checking if /json was changed..."
 egrep "\+{3}\s.\/json\/" diff.txt > json.txt
-if [[$? == 0]]; then
+if [ $? -eq 0 ]; then
     echo "JSON files are auto-generated! Please do not update these files:"
     cat json.txt
     exit 1

From b76486d66eb638e946a57c758ecbf0395e193909 Mon Sep 17 00:00:00 2001
From: davemachado <dave@davemachado.com>
Date: Thu, 26 Oct 2017 12:19:07 -0400
Subject: [PATCH 5/5] Move json into PR-only branch

---
 build/main.sh | 60 +++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/build/main.sh b/build/main.sh
index 93bc2f74..f95a2278 100755
--- a/build/main.sh
+++ b/build/main.sh
@@ -2,53 +2,53 @@
 
 FORMAT_FILE=../README.md
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-    echo "running on $TRAVIS_BRANCH branch"
-    LINK_FILE=../README.md
+  echo "running on $TRAVIS_BRANCH branch"
+  LINK_FILE=../README.md
 else
-    echo "running on Pull Request #$TRAVIS_PULL_REQUEST"
-    DIFF_URL="https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/$TRAVIS_PULL_REQUEST.diff"
-    curl $DIFF_URL > diff.txt
-    echo "------- BEGIN DIFF -------"
-    cat diff.txt
-    echo "-------- END DIFF --------"
-    cat diff.txt | egrep "\+" > additions.txt
-    echo "------ BEGIN ADDITIONS -----"
-    cat additions.txt
-    echo "------- END ADDITIONS ------"
-    LINK_FILE=additions.txt
-fi
+  echo "running on Pull Request #$TRAVIS_PULL_REQUEST"
+  DIFF_URL="https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/$TRAVIS_PULL_REQUEST.diff"
+  curl $DIFF_URL > diff.txt
+  echo "------- BEGIN DIFF -------"
+  cat diff.txt
+  echo "-------- END DIFF --------"
+  cat diff.txt | egrep "\+" > additions.txt
+  echo "------ BEGIN ADDITIONS -----"
+  cat additions.txt
+  echo "------- END ADDITIONS ------"
+  LINK_FILE=additions.txt
 
-echo "checking if /json was changed..."
-egrep "\+{3}\s.\/json\/" diff.txt > json.txt
-if [ $? -eq 0 ]; then
+  echo "checking if /json was changed..."
+  if egrep "\+{3}\s.\/json\/" diff.txt > json.txt; then
     echo "JSON files are auto-generated! Please do not update these files:"
     cat json.txt
     exit 1
-else
+  else
     echo "/json check passed!"
     rm json.txt
+  fi
+
 fi
 
 echo "running format validation..."
 ./validate_format.rb $FORMAT_FILE
 if [[ $? != 0 ]]; then
-    echo "format validation failed!"
-    exit 1
+  echo "format validation failed!"
+  exit 1
 else
-    echo "format validation passed!"
-    ./build.sh && ./deploy.sh
-    if [[ $? != 0 ]]; then
-        echo "JSON build and deploy failed!"
-    else
-        echo "JSON build and deploy success!"
-    fi
+  echo "format validation passed!"
+  ./build.sh && ./deploy.sh
+  if [[ $? != 0 ]]; then
+    echo "JSON build and deploy failed!"
+  else
+    echo "JSON build and deploy success!"
+  fi
 fi
 
 echo "running link validation..."
 ./validate_links.rb $LINK_FILE
 if [[ $? != 0 ]]; then
-    echo "link validation failed!"
-    exit 1
+  echo "link validation failed!"
+  exit 1
 else
-    echo "link validation passed!"
+  echo "link validation passed!"
 fi