Use patch for Sandstorm application modifications

babybuddy · Feb 8, 2020 · afe0ee8 · afe0ee8
1 parent 4179510
commit afe0ee8
Show file tree

Hide file tree

Showing 6 changed files with 318 additions and 131 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 # Application files.
 /babybuddy
-/.env
 
 # IDE files.
 /.idea
diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
-# Checkout desired version.
+# Checkout desired version and apply Sandstorm patch.
 VERSION=$(grep -oE 'appMarketingVersion = \(defaultText = "(.+)"' /opt/app/.sandstorm/sandstorm-pkgdef.capnp | cut -d '"' -f2)
 cd /opt/app/babybuddy
-git checkout v"${VERSION}"
-
-# Copy in Sandstorm specific application overrides.
-cp -rf /opt/app/overrides/* /opt/app/babybuddy
+git add --all
+git rm -rq --cached .venv  # TODO: Remove after base .gitignore update.
+git checkout -f v"${VERSION}"
+git apply /opt/app/sandstorm.patch
 
 # Set up virtual environment.
 VENV=/opt/app/babybuddy/.venv

diff --git a/overrides/babybuddy/management/commands/migrate.py b/overrides/babybuddy/management/commands/migrate.py
diff --git a/overrides/babybuddy/middleware.py b/overrides/babybuddy/middleware.py
diff --git a/overrides/babybuddy/settings/sandstorm.py b/overrides/babybuddy/settings/sandstorm.py