From 48eed22f3b84d7f3fb14a36cf8bdc4b2d60d3e6d Mon Sep 17 00:00:00 2001 From: DW Date: Fri, 20 Sep 2024 12:38:10 +0900 Subject: [PATCH] check IOCSH_STARTUP_SCRIPT before set --- modules/libcom/src/iocsh/iocsh.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libcom/src/iocsh/iocsh.cpp b/modules/libcom/src/iocsh/iocsh.cpp index 1e1cf1cd0..ae013f8a0 100644 --- a/modules/libcom/src/iocsh/iocsh.cpp +++ b/modules/libcom/src/iocsh/iocsh.cpp @@ -1325,7 +1325,7 @@ iocshCmd (const char *cmd) int epicsStdCall iocshLoad(const char *pathname, const char *macros) { - if (pathname) + if (pathname && !getenv("IOCSH_STARTUP_SCRIPT")) epicsEnvSet("IOCSH_STARTUP_SCRIPT", pathname); return iocshBody(pathname, NULL, macros); }