From 68116dcdea2ba7ea10fdc900128202a3329f12da Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 1 May 2020 18:36:01 +0100
Subject: [PATCH] Fix issue with Heroku + Django Compressor

---
 .gitignore                                    |  1 -
 hooks/post_gen_project.py                     |  7 ++++++
 {{cookiecutter.project_slug}}/.gitignore      |  1 -
 .../bin/post_compile                          | 22 +++++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/bin/post_compile

diff --git a/.gitignore b/.gitignore
index 54fafb8be7..efe33befac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -211,7 +211,6 @@ tags
 ### VirtualEnv template
 # Virtualenv
 # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-[Bb]in
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 13d0ff00a4..fae73e1109 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -75,6 +75,11 @@ def remove_heroku_files():
             # don't remove the file if we are using travisci but not using heroku
             continue
         os.remove(file_name)
+    remove_heroku_build_hooks()
+
+
+def remove_heroku_build_hooks():
+    shutil.rmtree("bin")
 
 
 def remove_gulp_files():
@@ -346,6 +351,8 @@ def main():
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
+    elif "{{ cookiecutter.use_compressor }}".lower() == "n":
+        remove_heroku_build_hooks()
 
     if (
         "{{ cookiecutter.use_docker }}".lower() == "n"
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index cb8ad83588..9850b12733 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -325,7 +325,6 @@ tags
 
 ### VirtualEnv template
 # Virtualenv
-[Bb]in
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
diff --git a/{{cookiecutter.project_slug}}/bin/post_compile b/{{cookiecutter.project_slug}}/bin/post_compile
new file mode 100644
index 0000000000..a9c94b39ad
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/bin/post_compile
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+compress_enabled() {
+python << END
+import sys
+
+from environ import Env
+
+env = Env(COMPRESS_ENABLED=(bool, True))
+if env('COMPRESS_ENABLED'):
+    sys.exit(0)
+else:
+    sys.exit(1)
+
+END
+}
+
+if compress_enabled
+then
+  python manage.py compress
+fi
+python manage.py collectstatic --noinput