diff --git a/Makefile b/Makefile index 8ec270c7e..7d5ca2ab8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ coffee := $(BIN)coffee -c --no-header template := node tools/template.js template_deps := package.json tools/template.js -# read name meta_name meta_distBranch meta_uploadPath +# read name meta_name meta_distBranch $(eval $(shell node tools/pkgvars.js)) # must be read in when needed to prevent out-of-date version @@ -252,7 +252,7 @@ distready : dist $(wildcard dist/* dist/*/*) .SECONDARY : -.PHONY: default all distready script crx release jshint install push captchas $(npgoals) +.PHONY: default all distready script crx release jshint install push $(npgoals) script : $(script) @@ -266,10 +266,6 @@ install : .events/install push : .events2/push-git .events2/push-web .events2/push-store -captchas : redirect.html $(template_deps) - $(template) redirect.html captchas.html url="$(url)" - scp captchas.html $(meta_uploadPath) - clean : $(RMDIR) tmp tmp-crx testbuilds .events $(RM) .tests_enabled @@ -278,7 +274,7 @@ cleanrel : clean $(RMDIR) builds cleanweb : - $(RM) test.html captchas.html + $(RM) test.html cleanfull : clean cleanweb $(RMDIR) .events2 dist node_modules diff --git a/package.json b/package.json index 1d43838c4..f3df7dd38 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc", "youtubeAPIKey": "AIzaSyB5_zaen_-46Uhz1xGR-lz1YoUMHqCD6CE", "distBranch": "gh-pages", - "uploadPath": "www.4chan-x.net:/var/www/html/", "includes_only": [ "*://boards.4chan.org/*", "*://sys.4chan.org/*", diff --git a/redirect.html b/redirect.html deleted file mode 100644 index 98360f04e..000000000 --- a/redirect.html +++ /dev/null @@ -1,10 +0,0 @@ -<% url = (url || 'https://www.4chan.org/feedback'); %> - - - -Redirect - - -Redirecting to <%= url %>... - -