Download zxcvbn.js rather than vendoring it.

(imported from commit 8d55b6b903dc2292852636dfb444219b643b5f64)
himao · Sep 25, 2015 · 9c0c5c5 · 9c0c5c5
1 parent f318160
commit 9c0c5c5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,5 +31,6 @@ event_queues.json
 .vagrant
 /zproject/dev-secrets.conf
 static/third/gemoji/
+static/third/zxcvbn/
 tools/emoji_dump/bitmaps/
 tools/emoji_dump/*.ttx
diff --git a/THIRDPARTY b/THIRDPARTY
@@ -229,10 +229,6 @@ Files: static/third/zocial/*
 Copyright: Sam Collins 
 License: Expat
 
-Files: static/third/zxcvbn/*
-Copyright: 2012-2015 Dan Wheeler and Dropbox, Inc.
-License: Expat
-
 Files: tools/inject-messages/othello
 Copyright: Shakespeare
 License: public-domain

diff --git a/provision.py b/provision.py
@@ -156,6 +156,7 @@ def main():
     # Management commands expect to be run from the root of the project.
     os.chdir(ZULIP_PATH)
 
+    os.system("tools/download-zxcvbn")
     os.system("tools/emoji_dump/build_emoji")
     os.system("generate_secrets.py -d")
     sh.configure_rabbitmq(**LOUD)

diff --git a/tools/download-zxcvbn b/tools/download-zxcvbn
@@ -0,0 +1,4 @@
+#!/bin/sh -ex
+
+mkdir -p static/third/zxcvbn/
+wget https://raw.githubusercontent.com/dropbox/zxcvbn/0890678ede1488ecb02cda7eb793cd308a59c49d/zxcvbn.js -o static/third/zxcvbn/zxcvbn.js
diff --git a/tools/update-prod-static b/tools/update-prod-static
@@ -34,6 +34,10 @@ subprocess.check_call(['python', 'tools/minify-js']
 subprocess.check_call(['bash', '-ex', 'tools/emoji_dump/build_emoji'],
                       stdout=fp, stderr=fp)
 
+# Download and include zxcvbn.js
+subprocess.check_call(['bash', '-ex', 'tools/download-zxcvbn'],
+                      stdout=fp, stderr=fp)
+
 # Collect the files that we're going to serve.
 subprocess.check_call(['python', './manage.py', 'collectstatic', '--noinput'],
                       stdout=fp, stderr=fp)