1
0
mirror of https://github.com/simh/simh.git synced 2026-05-20 03:07:11 +00:00

makefile: curl needs to be actively installed on some platforms

- Make missing curl or tar visible in simulator environment variables:
       SIM_CURL_CMD_AVAILABLE
and SIM_TAR_CMD_AVAILABLE
This commit is contained in:
Mark Pizzolato
2023-07-28 04:15:12 -10:00
parent b1d63da52b
commit f9dedad627
2 changed files with 23 additions and 15 deletions

16
scp.c
View File

@@ -7126,11 +7126,15 @@ if (flag) {
}
strlcpy (os_type, "Windows", sizeof (os_type));
strlcpy (tarversion, _get_tool_version ("tar"), sizeof (tarversion));
if (tarversion[0])
if (tarversion[0]) {
fprintf (st, "\n tar tool: %s", tarversion);
setenv ("SIM_TAR_CMD_AVAILABLE", "TRUE", 1);
}
strlcpy (curlversion, _get_tool_version ("curl"), sizeof (curlversion));
if (curlversion[0])
if (curlversion[0]) {
fprintf (st, "\n curl tool: %s", curlversion);
setenv ("SIM_CURL_CMD_AVAILABLE", "TRUE", 1);
}
}
#else
if (1) {
@@ -7213,11 +7217,15 @@ if (flag) {
}
#endif
strlcpy (tarversion, _get_tool_version ("tar"), sizeof (tarversion));
if (tarversion[0])
if (tarversion[0]) {
fprintf (st, "\n tar tool: %s", tarversion);
setenv ("SIM_TAR_CMD_AVAILABLE", "TRUE", 1);
}
strlcpy (curlversion, _get_tool_version ("curl"), sizeof (curlversion));
if (curlversion[0])
if (curlversion[0]) {
fprintf (st, "\n curl tool: %s", curlversion);
setenv ("SIM_CURL_CMD_AVAILABLE", "TRUE", 1);
}
}
#endif
if ((!strcmp (os_type, "Unknown")) && (getenv ("OSTYPE")))