From 05dfbc1a45a5b8dcf3fe5bebee1d52d98656c0c7 Mon Sep 17 00:00:00 2001
From: tnichols217 <62992267+tnichols217@users.noreply.github.com>
Date: Wed, 26 Feb 2025 19:55:58 -0500
Subject: [PATCH] add bg variants

---
 .envrc                  |  0
 README.md               |  0
 build.nix               | 10 ++++++----
 build.sh                |  0
 deploy.nix              |  0
 flake.lock              |  0
 flake.nix               |  2 ++
 src/_brand.yml          |  0
 src/build.py            |  0
 src/colors/black.sh     |  0
 src/colors/color.sh     |  0
 src/colors/red.sh       |  0
 src/colors/white.sh     |  0
 src/designs/OX.sh       |  0
 src/designs/logo.sh     |  0
 src/designs/logomark.sh |  0
 src/designs/stacked.sh  |  0
 src/post.sh             |  0
 src/style.sh            |  0
 src/template.svg        |  0
 20 files changed, 8 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 .envrc
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 build.nix
 mode change 100644 => 100755 build.sh
 mode change 100644 => 100755 deploy.nix
 mode change 100644 => 100755 flake.lock
 mode change 100644 => 100755 flake.nix
 mode change 100644 => 100755 src/_brand.yml
 mode change 100644 => 100755 src/build.py
 mode change 100644 => 100755 src/colors/black.sh
 mode change 100644 => 100755 src/colors/color.sh
 mode change 100644 => 100755 src/colors/red.sh
 mode change 100644 => 100755 src/colors/white.sh
 mode change 100644 => 100755 src/designs/OX.sh
 mode change 100644 => 100755 src/designs/logo.sh
 mode change 100644 => 100755 src/designs/logomark.sh
 mode change 100644 => 100755 src/designs/stacked.sh
 mode change 100644 => 100755 src/post.sh
 mode change 100644 => 100755 src/style.sh
 mode change 100644 => 100755 src/template.svg

diff --git a/.envrc b/.envrc
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/build.nix b/build.nix
old mode 100644
new mode 100755
index 7ed00cc..b6d373c
--- a/build.nix
+++ b/build.nix
@@ -1,15 +1,17 @@
-{ stdenv, imagemagick, envsubst, python3Full, zip, nopng ? false, ... }:
+{ stdenv, imagemagick, envsubst, python3Full, zip, util-linux, nopng ? false, bg ? "none", ... }:
 stdenv.mkDerivation {
   pname = "BetaNuBranding";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = ./src;
 
-  nativeBuildInputs = [ imagemagick envsubst python3Full zip ];
+  nativeBuildInputs = [ imagemagick envsubst python3Full zip util-linux ];
 
   buildPhase = ''
     python build.py
-    ${if nopng then "" else "mogrify -format png -density 2500 -background none out/*.svg" }
+    cd out
+    ${if nopng then "" else "mogrify -format png -density 2500 -background ${bg} *.svg" }
+    cd ..
   '';
 
   installPhase = ''
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
diff --git a/deploy.nix b/deploy.nix
old mode 100644
new mode 100755
diff --git a/flake.lock b/flake.lock
old mode 100644
new mode 100755
diff --git a/flake.nix b/flake.nix
old mode 100644
new mode 100755
index aa134e6..23d2e22
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,8 @@
         packages = rec {
           branding = pkgs.callPackage ./build.nix { };
           branding-nopng = pkgs.callPackage ./build.nix { nopng = true; };
+          branding-white = pkgs.callPackage ./build.nix { bg = "white"; };
+          branding-black = pkgs.callPackage ./build.nix { bg = "black"; };
           deploy = pkgs.callPackage ./deploy.nix { src = branding; };
           default = branding;
         };
diff --git a/src/_brand.yml b/src/_brand.yml
old mode 100644
new mode 100755
diff --git a/src/build.py b/src/build.py
old mode 100644
new mode 100755
diff --git a/src/colors/black.sh b/src/colors/black.sh
old mode 100644
new mode 100755
diff --git a/src/colors/color.sh b/src/colors/color.sh
old mode 100644
new mode 100755
diff --git a/src/colors/red.sh b/src/colors/red.sh
old mode 100644
new mode 100755
diff --git a/src/colors/white.sh b/src/colors/white.sh
old mode 100644
new mode 100755
diff --git a/src/designs/OX.sh b/src/designs/OX.sh
old mode 100644
new mode 100755
diff --git a/src/designs/logo.sh b/src/designs/logo.sh
old mode 100644
new mode 100755
diff --git a/src/designs/logomark.sh b/src/designs/logomark.sh
old mode 100644
new mode 100755
diff --git a/src/designs/stacked.sh b/src/designs/stacked.sh
old mode 100644
new mode 100755
diff --git a/src/post.sh b/src/post.sh
old mode 100644
new mode 100755
diff --git a/src/style.sh b/src/style.sh
old mode 100644
new mode 100755
diff --git a/src/template.svg b/src/template.svg
old mode 100644
new mode 100755