Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add PKGMAN_PathSystemProgram #126

Merged
merged 1 commit into from
Jul 29, 2024
Merged

add PKGMAN_PathSystemProgram #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions gap/PackageManager.gi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@

BindGlobal("PKGMAN_WHITESPACE", MakeImmutable(" \n\t\r"));

BindGlobal("PKGMAN_PathSystemProgram", function(name)
local dir, path;

for dir in DirectoriesSystemPrograms() do
path:= Filename(dir, name);
if IsExecutableFile(path) then
return path;
fi;
od;
return fail;
end);

InstallGlobalFunction(GetPackageURLs,
function()
local get, urls, line, items;
Expand Down Expand Up @@ -1000,7 +1012,7 @@ function(dir, cmd, args...)
local sh, fullcmd, instream, out, outstream, code;

# Check shell
sh := Filename(DirectoriesSystemPrograms(), "sh");
sh := PKGMAN_PathSystemProgram("sh");
if sh = fail then
Info(InfoPackageManager, 1, "No shell available called \"sh\"");
return fail;
Expand All @@ -1020,7 +1032,7 @@ function(dir, cmd, args...)
fullcmd := cmd;
else
# we must look up the path
fullcmd := Filename(DirectoriesSystemPrograms(), cmd);
fullcmd := PKGMAN_PathSystemProgram(cmd);
if fullcmd = fail or not IsExecutableFile(fullcmd) then
Info(InfoPackageManager, 4, "Command ", cmd, " not found");
return fail;
Expand All @@ -1033,7 +1045,7 @@ function(dir, cmd, args...)
outstream := OutputTextString(out, true);

# Execute the command (capture both stdout and stderr)
sh := Filename(DirectoriesSystemPrograms(), "sh");
sh := PKGMAN_PathSystemProgram("sh");
args := JoinStringsWithSeparator(args, " ");
fullcmd := Concatenation(fullcmd, " ", args, " 2>&1");
code := Process(dir, sh, instream, outstream, ["-c", fullcmd]);
Expand Down