From df78f3bfc3bab242c6f0f2f486e97c74fd93eab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Kr=C3=BCger?= <valknar@pivoine.art>
Date: Tue, 28 Oct 2025 23:32:14 +0100
Subject: [PATCH] refactor: apply env variable pattern to all sexy scripts

Extended environment variable usage to export scripts and simplified
the env loading pattern across all scripts.

Changes:
- sexy/db/export: now uses $DB_USER and $SEXY_DB_NAME
- sexy/export/all: now uses $DB_USER and $SEXY_DB_NAME
- All scripts: changed from 'set -a && source .env && set +a' to
  'export $(cat .env | xargs)' for cleaner, more concise syntax

This ensures consistent variable usage across all import/export scripts
and makes them work correctly in all environments.
---
 arty.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/arty.yml b/arty.yml
index 4eda77f..24ab9e4 100644
--- a/arty.yml
+++ b/arty.yml
@@ -70,9 +70,10 @@ scripts:
   # Database export scripts for sexy.pivoine.art
   # Export PostgreSQL database schema and data with DROP IF EXISTS statements
   sexy/db/export: |
+    export $(cat .env | xargs) &&
     docker exec core_postgres pg_dump \
-      -U sexy \
-      -d sexy \
+      -U $DB_USER \
+      -d $SEXY_DB_NAME \
       --no-owner \
       --no-acl \
       --clean \
@@ -89,10 +90,11 @@ scripts:
 
   # Combined export: both database and schema
   sexy/export/all: |
+    export $(cat .env | xargs) &&
     echo "Exporting database..." &&
     docker exec core_postgres pg_dump \
-      -U sexy \
-      -d sexy \
+      -U $DB_USER \
+      -d $SEXY_DB_NAME \
       --no-owner \
       --no-acl \
       --clean \
@@ -109,7 +111,7 @@ scripts:
   # Import PostgreSQL database from SQL dump
   # WARNING: This will DROP existing tables if they exist (uses --clean --if-exists)
   sexy/db/import: |
-    set -a && source .env && set +a &&
+    export $(cat .env | xargs) &&
     echo "⚠️  WARNING: This will replace the current database!" &&
     echo "Make sure core_postgres container is running..." &&
     docker exec -i core_postgres psql -U $DB_USER -d $SEXY_DB_NAME < ~/Projects/docker-compose/sexy/directus.sql &&
@@ -133,7 +135,7 @@ scripts:
   # Step 1: Import database (drops/recreates all tables)
   # Step 2: Apply schema (updates Directus metadata)
   sexy/import/all: |
-    set -a && source .env && set +a &&
+    export $(cat .env | xargs) &&
     echo "⚠️  WARNING: This will completely replace the database and schema!" &&
     echo "Importing database..." &&
     docker exec -i core_postgres psql -U $DB_USER -d $SEXY_DB_NAME < ~/Projects/docker-compose/sexy/directus.sql &&