Merge pull request #753 from dotnet-script/bugfix/path-detection

seesharper · web-flow · commit 4121d1ae0a67 · 2024-05-07T22:42:52.000+02:00
fixed global tool path detection
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
         run: dotnet-script build/Build.csx
 
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.gitignore b/.gitignore
@@ -266,3 +266,4 @@ project.json
 /dotnet-script
 /.vscode
 /src/Dotnet.Script/Properties/launchSettings.json
+.DS_Store
diff --git a/src/Dotnet.Script.Core/Scaffolder.cs b/src/Dotnet.Script.Core/Scaffolder.cs
@@ -141,7 +141,7 @@ private void CreateLaunchConfiguration(string currentWorkingDirectory)
             _scriptConsole.WriteNormal("Creating VS Code launch configuration file");
             string pathToLaunchFile = Path.Combine(vsCodeDirectory, "launch.json");
             string installLocation = _scriptEnvironment.InstallLocation;
-            bool isInstalledAsGlobalTool = installLocation.Contains(".dotnet/tools", StringComparison.OrdinalIgnoreCase);
+            bool isInstalledAsGlobalTool = installLocation.Contains($".dotnet{Path.DirectorySeparatorChar}tools", StringComparison.OrdinalIgnoreCase);
             string dotnetScriptPath = Path.Combine(installLocation, "dotnet-script.dll").Replace(@"\", "/");
             string launchFileContent;
             if (!File.Exists(pathToLaunchFile))
diff --git a/src/Dotnet.Script.Tests/ScaffoldingTests.cs b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
@@ -179,7 +179,7 @@ public void ShouldUpdatePathToDotnetScript()
         [Fact]
         public void ShouldCreateUnifiedLaunchFileWhenInstalledAsGlobalTool()
         {
-            Scaffolder scaffolder = CreateTestScaffolder("somefolder/.dotnet/tools/dotnet-script");
+            Scaffolder scaffolder = CreateTestScaffolder($"somefolder{Path.DirectorySeparatorChar}.dotnet{Path.DirectorySeparatorChar}tools{Path.DirectorySeparatorChar}dotnet-script");
 
             using var scriptFolder = new DisposableFolder();
             scaffolder.InitializerFolder("main.csx", scriptFolder.Path);
@@ -191,7 +191,7 @@ public void ShouldCreateUnifiedLaunchFileWhenInstalledAsGlobalTool()
         public void ShouldUpdateToUnifiedLaunchFileWhenInstalledAsGlobalTool()
         {
             Scaffolder scaffolder = CreateTestScaffolder("some-install-folder");
-            Scaffolder globalToolScaffolder = CreateTestScaffolder("somefolder/.dotnet/tools/dotnet-script");
+            Scaffolder globalToolScaffolder = CreateTestScaffolder($"somefolder{Path.DirectorySeparatorChar}.dotnet{Path.DirectorySeparatorChar}tools{Path.DirectorySeparatorChar}dotnet-script");
             using var scriptFolder = new DisposableFolder();
             scaffolder.InitializerFolder("main.csx", scriptFolder.Path);
             var fileContent = File.ReadAllText(Path.Combine(scriptFolder.Path, ".vscode", "launch.json"));
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -250,7 +250,9 @@ public void ShouldSupportInlineNugetReferencesWithTrailingSemicoloninEvaluatedCo
 
         [Theory]
         [InlineData("https://gist.githubusercontent.com/seesharper/5d6859509ea8364a1fdf66bbf5b7923d/raw/0a32bac2c3ea807f9379a38e251d93e39c8131cb/HelloWorld.csx",
-                    "Hello World")]
+            "Hello World")]
+        [InlineData("http://gist.githubusercontent.com/seesharper/5d6859509ea8364a1fdf66bbf5b7923d/raw/0a32bac2c3ea807f9379a38e251d93e39c8131cb/HelloWorld.csx",
+            "Hello World")]
         [InlineData("https://github.com/dotnet-script/dotnet-script/files/5035247/hello.csx.gz",
                     "Hello, world!")]
         public void ShouldExecuteRemoteScript(string url, string output)
@@ -259,14 +261,6 @@ public void ShouldExecuteRemoteScript(string url, string output)
             Assert.Contains(output, result.Output);
         }
 
-        [Fact]
-        public void ShouldExecuteRemoteScriptUsingTinyUrl()
-        {
-            var url = "https://tinyurl.com/y8cda9zt";
-            var (output, _) = ScriptTestRunner.Default.Execute(url);
-            Assert.Contains("Hello World", output);
-        }
-
         [Fact]
         public void ShouldHandleIssue268()
         {
