manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Emit errors concerning WSL commands

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-17 13:51:10 +02:00
parent 9e716bce4f
commit 11ae127dba
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/Common/Scripts/Config.ps1
View file

@ -37,7 +37,13 @@ $null = New-Module {
wsl -e printf "%q" "$result";
};
Receive-Job -Wait $job;
$result = Receive-Job -Wait $job;
if ($job.State -ne ([System.Management.Automation.JobState]::Completed)) {
Write-Error "An error occurred while converting ``$Path`` to a Linux path.`nOutput: ``$result``";
}
$result;
}
<#
@ -87,11 +93,17 @@ $null = New-Module {
wsl --shell-type login -- nix --extra-experimental-features "nix-command flakes" run nixpkgs`#fish -- $args
}
fish -c ". $(ConvertTo-LinuxPath $scriptPath); $Script" | ConvertFrom-Json;
}
$output = fish -c ". $(ConvertTo-LinuxPath $scriptPath); $Script";
if (-not $?) {
throw "The configuration could not be retrieved!";
if (-not $?) {
Write-Error "The configuration could not be retrieved!";
} else {
if (-not ($output -and ($output | Test-Json))) {
Write-Error "The value ``$output`` is not valid JSON.";
} else {
$output | ConvertFrom-Json;
}
}
}
}