Merge branch 'master' of git://github.com/toddmotto/public-apis

.github/CONTRIBUTING.md

@@ -20,7 +20,7 @@ Example entry:
 | NASA | NASA data, including imagery | No | Yes | [Go!](https://api.nasa.gov) |
 ```
 
-Currently, the only accepted inputs for this field are as follows:
+\* Currently, the only accepted inputs for this field are as follows:
 
 * `OAuth` - _the API supports OAuth_
 * `apiKey` - _the API uses a private key string/token for authentication - try and use the correct parameter_

build/main.sh

@@ -16,6 +16,17 @@ else
   cat additions.txt
   echo "------- END ADDITIONS ------"
   LINK_FILE=additions.txt
+
+  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
+    echo "/json check passed!"
+    rm json.txt
+  fi
+
 fi
 
 echo "checking if /json was changed..."

build/validate_links.rb

@@ -50,6 +50,8 @@ links.each do |link|
         if !allowed_codes.include?(res.code)
             fails.push("(#{res.code}): #{link}")
         end
+    rescue HTTParty::RedirectionTooDeep
+        fails.push("(RTD): #{link}")
     rescue Net::ReadTimeout
         fails.push("(TMO): #{link}")
     rescue Net::OpenTimeout
@@ -60,6 +62,8 @@ links.each do |link|
         fails.push("(SOK): #{link}")
     rescue Errno::ECONNREFUSED
         fails.push("(CON): #{link}")
+    rescue Errno::ECONNRESET
+        next
     end
     progressbar.increment
 end

json/README.md

+# This directory contains auto-generated JSON. Do not modify.