From baca33c565d077928a3477116ccbfb7fa45e5147 Mon Sep 17 00:00:00 2001
From: Andreas Dueren <andreas@due.ren>
Date: Tue, 18 Mar 2025 18:56:10 +0100
Subject: [PATCH] Fixed shell script syntax errors and created missing
 db_override.go file

---
 start.sh | 81 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/start.sh b/start.sh
index f2bf967..d1b0182 100644
--- a/start.sh
+++ b/start.sh
@@ -457,24 +457,24 @@ elif [ -d "$SERVER_DIR/cmd/museum" ]; then
     # Create a startup script
     cat > /tmp/run_server.sh <<EOF
 #!/bin/bash
-cd "$SERVER_DIR" && \
-PGHOST="${CLOUDRON_POSTGRESQL_HOST}" \
-PGPORT="${CLOUDRON_POSTGRESQL_PORT}" \
-PGUSER="${CLOUDRON_POSTGRESQL_USERNAME}" \
-PGPASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \
-PGDATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \
-PGSSLMODE="disable" \
-ENTE_PG_HOST="${MUSEUM_DB_HOST}" \
-ENTE_PG_PORT="${MUSEUM_DB_PORT}" \
-ENTE_PG_USER="${MUSEUM_DB_USER}" \
-ENTE_PG_PASSWORD="${MUSEUM_DB_PASSWORD}" \
-ENTE_PG_DATABASE="${MUSEUM_DB_NAME}" \
-ENTE_PG_DSN="postgres://${MUSEUM_DB_USER}:${MUSEUM_DB_PASSWORD}@${MUSEUM_DB_HOST}:${MUSEUM_DB_PORT}/${MUSEUM_DB_NAME}?sslmode=disable&host=${MUSEUM_DB_HOST}" \
-CLOUDRON_POSTGRESQL_HOST="${CLOUDRON_POSTGRESQL_HOST}" \
-CLOUDRON_POSTGRESQL_PORT="${CLOUDRON_POSTGRESQL_PORT}" \
-CLOUDRON_POSTGRESQL_USERNAME="${CLOUDRON_POSTGRESQL_USERNAME}" \
-CLOUDRON_POSTGRESQL_PASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \
-CLOUDRON_POSTGRESQL_DATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \
+cd "$SERVER_DIR" && \\
+PGHOST="${CLOUDRON_POSTGRESQL_HOST}" \\
+PGPORT="${CLOUDRON_POSTGRESQL_PORT}" \\
+PGUSER="${CLOUDRON_POSTGRESQL_USERNAME}" \\
+PGPASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \\
+PGDATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \\
+PGSSLMODE="disable" \\
+ENTE_PG_HOST="${MUSEUM_DB_HOST}" \\
+ENTE_PG_PORT="${MUSEUM_DB_PORT}" \\
+ENTE_PG_USER="${MUSEUM_DB_USER}" \\
+ENTE_PG_PASSWORD="${MUSEUM_DB_PASSWORD}" \\
+ENTE_PG_DATABASE="${MUSEUM_DB_NAME}" \\
+ENTE_PG_DSN="postgres://${MUSEUM_DB_USER}:${MUSEUM_DB_PASSWORD}@${MUSEUM_DB_HOST}:${MUSEUM_DB_PORT}/${MUSEUM_DB_NAME}?sslmode=disable&host=${MUSEUM_DB_HOST}" \\
+CLOUDRON_POSTGRESQL_HOST="${CLOUDRON_POSTGRESQL_HOST}" \\
+CLOUDRON_POSTGRESQL_PORT="${CLOUDRON_POSTGRESQL_PORT}" \\
+CLOUDRON_POSTGRESQL_USERNAME="${CLOUDRON_POSTGRESQL_USERNAME}" \\
+CLOUDRON_POSTGRESQL_PASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \\
+CLOUDRON_POSTGRESQL_DATABASE="${CLOUDRON_POSTGRESQL_DATABASE}"
 EOF
 
     # Check if we have a patched main.go to use
@@ -627,24 +627,24 @@ elif [ -d "$SERVER_DIR/cmd/museum" ]; then
     # Create a startup script
     cat > /tmp/run_public_server.sh <<EOF
 #!/bin/bash
-cd "$SERVER_DIR" && \
-PGHOST="${CLOUDRON_POSTGRESQL_HOST}" \
-PGPORT="${CLOUDRON_POSTGRESQL_PORT}" \
-PGUSER="${CLOUDRON_POSTGRESQL_USERNAME}" \
-PGPASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \
-PGDATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \
-PGSSLMODE="disable" \
-ENTE_PG_HOST="${MUSEUM_DB_HOST}" \
-ENTE_PG_PORT="${MUSEUM_DB_PORT}" \
-ENTE_PG_USER="${MUSEUM_DB_USER}" \
-ENTE_PG_PASSWORD="${MUSEUM_DB_PASSWORD}" \
-ENTE_PG_DATABASE="${MUSEUM_DB_NAME}" \
-ENTE_PG_DSN="postgres://${MUSEUM_DB_USER}:${MUSEUM_DB_PASSWORD}@${MUSEUM_DB_HOST}:${MUSEUM_DB_PORT}/${MUSEUM_DB_NAME}?sslmode=disable&host=${MUSEUM_DB_HOST}" \
-CLOUDRON_POSTGRESQL_HOST="${CLOUDRON_POSTGRESQL_HOST}" \
-CLOUDRON_POSTGRESQL_PORT="${CLOUDRON_POSTGRESQL_PORT}" \
-CLOUDRON_POSTGRESQL_USERNAME="${CLOUDRON_POSTGRESQL_USERNAME}" \
-CLOUDRON_POSTGRESQL_PASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \
-CLOUDRON_POSTGRESQL_DATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \
+cd "$SERVER_DIR" && \\
+PGHOST="${CLOUDRON_POSTGRESQL_HOST}" \\
+PGPORT="${CLOUDRON_POSTGRESQL_PORT}" \\
+PGUSER="${CLOUDRON_POSTGRESQL_USERNAME}" \\
+PGPASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \\
+PGDATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \\
+PGSSLMODE="disable" \\
+ENTE_PG_HOST="${MUSEUM_DB_HOST}" \\
+ENTE_PG_PORT="${MUSEUM_DB_PORT}" \\
+ENTE_PG_USER="${MUSEUM_DB_USER}" \\
+ENTE_PG_PASSWORD="${MUSEUM_DB_PASSWORD}" \\
+ENTE_PG_DATABASE="${MUSEUM_DB_NAME}" \\
+ENTE_PG_DSN="postgres://${MUSEUM_DB_USER}:${MUSEUM_DB_PASSWORD}@${MUSEUM_DB_HOST}:${MUSEUM_DB_PORT}/${MUSEUM_DB_NAME}?sslmode=disable&host=${MUSEUM_DB_HOST}" \\
+CLOUDRON_POSTGRESQL_HOST="${CLOUDRON_POSTGRESQL_HOST}" \\
+CLOUDRON_POSTGRESQL_PORT="${CLOUDRON_POSTGRESQL_PORT}" \\
+CLOUDRON_POSTGRESQL_USERNAME="${CLOUDRON_POSTGRESQL_USERNAME}" \\
+CLOUDRON_POSTGRESQL_PASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \\
+CLOUDRON_POSTGRESQL_DATABASE="${CLOUDRON_POSTGRESQL_DATABASE}"
 EOF
 
     # Check if we have a patched main.go to use
@@ -933,9 +933,10 @@ wait $SERVER_PID
 wait $PUBLIC_SERVER_PID
 wait $CADDY_PID
 
-# Create a new go file to inject into the build that overrides the database connection
+# Create the overrides directory and db_override.go file
 mkdir -p "$SERVER_DIR/overrides"
-cat > "$SERVER_DIR/overrides/db_override.go" <<EOF
+echo "==> Creating db_override.go in overrides directory"
+cat > "$SERVER_DIR/overrides/db_override.go" <<EOT
 // Override database functions - will be added to museum build
 package main
 
@@ -983,4 +984,6 @@ func forceCorrectDatabase() (*sql.DB, error) {
 	log.Printf("Opening database connection with: %s", connStr)
 	return sql.Open("postgres", connStr)
 }
-EOF 
\ No newline at end of file
+EOT
+
+echo "==> Created overrides/db_override.go" 
\ No newline at end of file