Fix operable scripts

input-output-hk · Mar 21, 2023 · 0d37711 · 0d37711
1 parent b05723a
commit 0d37711
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/deploy/operables.nix b/deploy/operables.nix
@@ -167,7 +167,8 @@ in
 
       ${wait-for-socket}/bin/wait-for-socket "$CARDANO_NODE_SOCKET_PATH"
 
-      ${packages.marlowe-chain-indexer}/bin/marlowe-chain-indexer $([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file "$LOG_CONFIG_FILE") \
+      ${packages.marlowe-chain-indexer}/bin/marlowe-chain-indexer \
+        "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file)" "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo "$LOG_CONFIG_FILE")" \
         --socket-path "$CARDANO_NODE_SOCKET_PATH" \
         --database-uri  "$DATABASE_URI" \
         --shelley-genesis-config-file "$SHELLEY_GENESIS_CONFIG" \
@@ -222,7 +223,8 @@ in
       ${wait-for-socket}/bin/wait-for-socket "$CARDANO_NODE_SOCKET_PATH"
 
       DATABASE_URI=${database-uri}
-      ${packages.marlowe-chain-sync}/bin/marlowe-chain-sync $([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file "$LOG_CONFIG_FILE") \
+      ${packages.marlowe-chain-sync}/bin/marlowe-chain-sync \
+        "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file)" "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo "$LOG_CONFIG_FILE")" \
         --host "$HOST" \
         --port "$PORT" \
         --query-port "$QUERY_PORT" \
@@ -280,7 +282,8 @@ in
 
       ${wait-for-tcp}/bin/wait-for-tcp "$MARLOWE_CHAIN_SYNC_HOST" "$MARLOWE_CHAIN_SYNC_PORT"
 
-      ${packages.marlowe-indexer}/bin/marlowe-indexer $([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file "$LOG_CONFIG_FILE") \
+      ${packages.marlowe-indexer}/bin/marlowe-indexer \
+        "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file)" "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo "$LOG_CONFIG_FILE")" \
         --database-uri  "$DATABASE_URI" \
         --chain-sync-port "$MARLOWE_CHAIN_SYNC_PORT" \
         --chain-sync-query-port "$MARLOWE_CHAIN_SYNC_QUERY_PORT" \
@@ -325,7 +328,9 @@ in
 
       [ -z "''${DB_HOST:-}" ] && echo "DB_HOST env var must be set -- aborting" && exit 1
 
-      DATABASE_URI=${database-uri} ${packages.marlowe-sync}/bin/marlowe-sync $([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file "$LOG_CONFIG_FILE") \
+      DATABASE_URI=${database-uri}
+      ${packages.marlowe-sync}/bin/marlowe-sync \
+        "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file)" "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo "$LOG_CONFIG_FILE")" \
         --database-uri  "$DATABASE_URI" \
         --host "$HOST" \
         --sync-port "$MARLOWE_SYNC_PORT" \
@@ -361,7 +366,8 @@ in
 
       ${wait-for-tcp}/bin/wait-for-tcp "$MARLOWE_CHAIN_SYNC_HOST" "$MARLOWE_CHAIN_SYNC_PORT"
 
-      ${packages.marlowe-tx}/bin/marlowe-tx $([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file "$LOG_CONFIG_FILE") \
+      ${packages.marlowe-tx}/bin/marlowe-tx \
+        "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file)" "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo "$LOG_CONFIG_FILE")" \
         --host "$HOST" \
         --command-port "$PORT" \
         --chain-sync-port "$MARLOWE_CHAIN_SYNC_PORT" \
@@ -401,7 +407,8 @@ in
       ${wait-for-tcp}/bin/wait-for-tcp "$TX_HOST" "$TX_PORT"
       ${wait-for-tcp}/bin/wait-for-tcp "$SYNC_HOST" "$MARLOWE_QUERY_PORT"
 
-      ${packages.marlowe-proxy}/bin/marlowe-proxy $([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file "$LOG_CONFIG_FILE") \
+      ${packages.marlowe-proxy}/bin/marlowe-proxy \
+        "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo --log-config-file)" "$([ -z "''${LOG_CONFIG_FILE:-}" ] || echo "$LOG_CONFIG_FILE")" \
         --host "$HOST" \
         --port "$PORT" \
         --marlowe-sync-host "$SYNC_HOST" \