Refactored HSS processing/YUI compression

lethain · Oct 24, 2008 · 5785733 · 5785733
1 parent b483327
commit 5785733
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/build.py b/build.py
@@ -37,16 +37,16 @@ def main():
             print u"Ignored '%s'" % filename
         elif hss and ext in (".hss"):
             in_path = os.path.join(static_dir, filename)
+            out_path = os.path.join(deploy_static_dir, filename)
+            filename = u"%s.css" % os.path.splitext(filename)[0]
+            print u"Compiling HSS to CSS, compressing and copying %s to deploy/static" % filename
+            s,o=commands.getstatusoutput(u"%s %s -output %s/" % (hss, in_path, deploy_static_dir))
+            if s > 0: print o
             if compress:
-                print u"Compiling HSS to CSS, compressing and copying %s to deploy/static" % filename
-                commands.getoutput(u"%s %s -output %s/" % (hss, in_path, tmp_dir))
-                filename = u"%s.css" % before_ext
-                in_path = os.path.join(tmp_dir, filename)
-                out_path = os.path.join(deploy_static_dir, filename)
-                commands.getoutput(u"java -jar %s %s > %s" % (compress, in_path, out_path))
-            else:
-                print u"Compiling HSS to CSS, and copying %s to deploy/static" % filename
-                commands.getoutput(u"%s %s -output %s/" % (hss, in_path, deploy_static_dir))
+                print u"Compressing %s" % filename
+                s,o=commands.getstatusoutput(u"java -jar %s %s > %s" % (compress, in_path, out_path))
+                if s > 0: print o
+
         elif settings.USE_CLEVER_CSS and ext in (settings.CLEVER_CSS_EXT):
             print u"Compiling via CleverCSS, and copying '%s' to deploy/static/" % filename
             import clevercss