From 0b103afecaf561bf7af2d5cecafb7eeca2b1e3a1 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sat, 18 Apr 2015 16:06:56 +0530
Subject: [PATCH] minify before overwriting old file; oxjs removes old tree,
 always build geo

---
 pandora/app/config.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pandora/app/config.py b/pandora/app/config.py
index 50c7d4df..d63e6637 100644
--- a/pandora/app/config.py
+++ b/pandora/app/config.py
@@ -205,11 +205,7 @@ def update_static():
     oxjs_build = os.path.join(settings.STATIC_ROOT, 'oxjs/tools/build/build.py')
     if os.path.exists(oxjs_build):
         print 'update oxjs'
-        if os.path.exists(os.path.join(settings.STATIC_ROOT, 'oxjs/min/Geo/json/Geo.json')):
-            geo = '-nogeo'
-        else:
-            geo = ''
-        os.system('%s %s >/dev/null' % (oxjs_build, geo))
+        os.system('%s >/dev/null' % oxjs_build)
 
     data = ''
     js = []
@@ -234,8 +230,8 @@ def update_static():
         'png/icon.png',
     ]
     print 'write', pandora_js
+    data = ox.js.minify(data)
     with open(pandora_js, 'w') as f:
-        data = ox.js.minify(data)
         f.write(data)
 
     print 'write', pandora_json