fixes rune cli

vein-lang · Aug 17, 2024 · 67163fe · 67163fe
1 parent 7029d63
commit 67163fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/lib/projectsystem/Workload.converters.cs b/lib/projectsystem/Workload.converters.cs
@@ -200,7 +200,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
     public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
     {
-        var packages = (Dictionary<PackageKey, WorkloadPackage>)value;
+        var packages = (Dictionary<PackageKey, T>)value;
         writer.WriteStartObject();
 
         foreach (var kvp in packages)

diff --git a/metadata/scripts/install.ps1 b/metadata/scripts/install.ps1
@@ -3,7 +3,6 @@ $arch = if ([System.Environment]::Is64BitOperatingSystem) { "win-x64" } else { "
 $apiUrl = "https://releases.vein-lang.org/api/get-release"
 
 $outputDir = "$HOME\.vein"
-$binDir = "$outputDir\bin"
 
 function DownloadFile($url, $outputFile) {
     $webClient = New-Object System.Net.WebClient
@@ -14,19 +13,17 @@ try {
     $releaseInfo = Invoke-RestMethod -Uri $apiUrl
     $asset = $releaseInfo.assets | Where-Object { $_.name -eq "rune.$arch.zip" }
     $downloadUrl = $asset.browser_download_url
+    Write-Output $downloadUrl
     New-Item -ItemType Directory -Force -Path $outputDir > $null
-    New-Item -ItemType Directory -Force -Path $binDir > $null
     $zipFile = "$outputDir\rune.$arch.zip"
     DownloadFile $downloadUrl $zipFile
-    Expand-Archive -Path $zipFile -DestinationPath $binDir -Force > $null
+    Expand-Archive -Path $zipFile -DestinationPath $outputDir -Force > $null
     Remove-Item -Force $zipFile > $null
-    $env:Path += ";$binDir"
+    $env:Path += ";$outputDir"
     [Environment]::SetEnvironmentVariable("Path", $env:Path, [EnvironmentVariableTarget]::User)
 
-    & "$binDir\rune.exe" install workload vein.runtime --version latest
-    & "$binDir\rune.exe" install workload vein.compiler --version latest
-
-
+    Invoke-Expression "$outputDir\rune.exe workload install vein.runtime"
+    Invoke-Expression "$outputDir\rune.exe workload install vein.compiler"
     Write-Output "Rune Installed, restart your teminal for use"
 }
 catch {

diff --git a/metadata/scripts/install.sh b/metadata/scripts/install.sh
@@ -58,7 +58,7 @@ if [ -f "$HOME/.zshrc" ]; then
     source "$HOME/.zshrc"
 fi
 
-"$BIN_DIR/rune" install workload vein.runtime --version latest
-"$BIN_DIR/rune" install workload vein.compiler --version latest
+"$BIN_DIR/rune" workload install vein.runtime
+"$BIN_DIR/rune" workload install vein.compiler
 
 echo "Installation complete. Please restart your terminal to use the new PATH."
diff --git a/tools/rune-cli/WorkloadDb.cs b/tools/rune-cli/WorkloadDb.cs
@@ -12,15 +12,15 @@ public class WorkloadDb
     public async Task RegistryTool(PackageKey key, WorkloadPackageTool tool, DirectoryInfo baseFolder)
     {
         var db = await OpenAsync();
-        db.tools.TryAdd(key,  new Dictionary<string, FileInfo>());
+        db.tools.TryAdd(key,  new Dictionary<string, string>());
 
 
         var file = new FileInfo(Symlink.ToExec(tool.ExecPath));
         var toolExec = baseFolder.Combine(file);
         var name = string.IsNullOrEmpty(tool.OverrideName)
             ? Path.GetFileNameWithoutExtension(file.Name)
             : tool.OverrideName;
-        db.tools[key][name] = toolExec;
+        db.tools[key][name] = toolExec.FullName;
         await SaveAsync(db);
     }
 
@@ -40,7 +40,7 @@ public async Task RegistrySdkAsync(string sdkTarget, string alias, DirectoryInfo
         if (db.tools.TryGetValue(key, out var tools))
         {
             if (tools.TryGetValue(name, out var result))
-                return result;
+                return new FileInfo(result);
         }
         if (throwIfNotFound)
             throw new NotFoundToolException(name, key);
@@ -66,7 +66,7 @@ private async Task SaveAsync(WorkloadDatabase db)
 
 public record WorkloadDatabase
 {
-    [JsonConverter(typeof(DictionaryWithPackageKeyConverter<Dictionary<string, FileInfo>>))]
-    public Dictionary<PackageKey, Dictionary<string, FileInfo>> tools = new();
+    [JsonConverter(typeof(DictionaryWithPackageKeyConverter<Dictionary<string, string>>))]
+    public Dictionary<PackageKey, Dictionary<string, string>> tools = new();
     public Dictionary<string, List<string>> sdks = new();
 }