From 480cff76b4cdc896a8c7dcdbd87cfe42f47fd502 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Wed, 18 Oct 2023 10:37:53 -0400
Subject: [PATCH] Removed unnecessary dots and made the default bin_dir the
current directory
---
.../pexable/ingest_envoy/ingest_envoy/collectors.py | 2 +-
.../pexable/ingest_envoy/ingest_envoy/launchers.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py
index 067223884..6a9a98fe7 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py
@@ -181,7 +181,7 @@ class ObservationCollector(CollectorIF):
# run script
collector = subprocess.run(
- [f".{sbin_dir}/observation-product-collector.sh", source_path, workflow_dir, staging_dir],
+ [f"{sbin_dir}/observation-product-collector.sh", source_path, workflow_dir, staging_dir],
stdout=sys.stdout,
stderr=sys.stderr,
)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py
index 617e8a219..866d679f6 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py
@@ -33,7 +33,7 @@ from ingest_envoy.schema import AbstractTextFile
from ingest_envoy.utilities import IngestType, VLASSIngestType
-def trigger_ingest(real_ingest: bool, staging_dir: str, bin_dir: str = "") -> int:
+def trigger_ingest(real_ingest: bool, staging_dir: str, bin_dir: str = ".") -> int:
"""
Run ingest
@@ -45,7 +45,7 @@ def trigger_ingest(real_ingest: bool, staging_dir: str, bin_dir: str = "") -> in
if real_ingest:
# TODO: This should be cleaned up when cal and image ingests don't transfer files into condor and use sbin
ingest_process = subprocess.run(
- [f".{bin_dir}/ingest", "--json", "-p", staging_dir],
+ [f"{bin_dir}/ingest", "--json", "-p", staging_dir],
stdout=sys.stdout,
stderr=sys.stderr,
)
--
GitLab