Merge pull request #89 from nervosnetwork/release/v0.3.2

Release/v0.3.2
nervosnetwork · Jun 1, 2021 · 225b7c9 · 225b7c9
2 parents 6e0b709 + d95fe14
commit 225b7c9
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 15 deletions.
diff --git a/src/Tippy.Ctrl/Process/BinariesInfo.cs b/src/Tippy.Ctrl/Process/BinariesInfo.cs
@@ -48,7 +48,6 @@ internal void Refresh()
         void RefreshDebuggerDeps()
         {
             HasDebuggerDeps = true;
-            // BUGBUG: .Net won't find commands on M1 Mac which has homebrew location at `/opt/homebrew/bin`.
             foreach (var dep in new List<string>() { "gdb", "ttyd" })
             {
                 try
@@ -61,10 +60,7 @@ void RefreshDebuggerDeps()
                     process.StartInfo.RedirectStandardOutput = true;
                     process.OutputDataReceived += (sender, e) =>
                     {
-                        if (!String.IsNullOrEmpty(e.Data))
-                        {
-                            Info += e.Data + "\n";
-                        }
+                        // Do not show gdb/ttyd
                     };
                     process.Start();
                     process.BeginOutputReadLine();

diff --git a/src/Tippy.Ctrl/Process/Debugger/ProcessManager.cs b/src/Tippy.Ctrl/Process/Debugger/ProcessManager.cs
@@ -10,7 +10,6 @@ public class ProcessManager
         public static void Start(Project project, string scriptGroupType, string scriptHash, string txFilePath, string debugFilePath, string ioType, int ioIndex, string? binaryForDebugger)
         {
             Stop();
-            // TODO: Maybe not need project.
             ProcessInfo processInfo = ProcessInfo.FromProject(project);
             GdbProcessInstance = new GdbProcess(processInfo, debugFilePath);
             DebuggerProcessInstance = new DebuggerProcess(processInfo, scriptGroupType, scriptHash, txFilePath, ioType, ioIndex, binaryForDebugger);
@@ -23,5 +22,18 @@ public static void Stop()
             GdbProcessInstance?.Stop();
             DebuggerProcessInstance?.Stop();
         }
+
+        public static void SetEnv()
+        {
+            // BUGBUG: .Net won't find commands on M1 Mac which has homebrew location at `/opt/homebrew/bin`,
+            // or on Linux which at `~/.linuxbrew/bin`.
+            var path = System.Environment.GetEnvironmentVariable("PATH") ?? "";
+            if (!string.IsNullOrEmpty(path))
+            {
+                path += ":";
+            }
+            path += "/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin:~/.linuxbrew/bin";
+            System.Environment.SetEnvironmentVariable("PATH", path);
+        }
     }
 }
diff --git a/src/Tippy.Ctrl/ProcessManager.cs b/src/Tippy.Ctrl/ProcessManager.cs
@@ -70,6 +70,7 @@ public static string GetLogFolder(Project project)
 
         public static void FetchInfo()
         {
+            Process.Debugger.ProcessManager.SetEnv();
             BinariesInfo binariesInfo = new();
             binariesInfo.Refresh();
             Info = binariesInfo.Info;

diff --git a/src/Tippy.Util/UrlOpener.cs b/src/Tippy.Util/UrlOpener.cs
@@ -26,7 +26,7 @@ public static void Open(string url)
             }
             catch
             {
-                Console.WriteLine($"Couldn't open URL $(url). Try opening it from your browser.");
+                Console.WriteLine($"Couldn't open URL {url}. Try opening it from your browser.");
             }
         }
     }

diff --git a/src/Tippy/Pages/Transactions/Details.cshtml b/src/Tippy/Pages/Transactions/Details.cshtml
@@ -140,11 +140,11 @@
                     @if (Model.IsDebuggerSupported)
                     {
                         <div class="column is-10">
-                            @if (Model.DebuggerDepsInstalled)
+                            @if (Model.DebuggerDepsInstalled)
                             {
                                 <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="input" asp-route-scriptType="0" class="button">Debug this script</a>
                             }
-                            else
+                            else
                             {
                                 <a class="button" href="#" disabled>Debug this script</a>
                             }
@@ -178,7 +178,7 @@
                               {
                                   <a class="button" href="#" disabled>Debug this script</a>
                               }
-                                <Partial name="_DebuggerInfo" />
+                              <Partial name="_DebuggerInfo" />
                             </div>
                         }
                     }
@@ -300,11 +300,17 @@
                 @if (Model.IsDebuggerSupported)
                 {
                     <div class="column is-5">
-                        <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="output" asp-route-scriptType="1" class="button">Debug this script</a>
+                        @if (Model.DebuggerDepsInstalled)
+                        {
+                            <a asp-page="/Debugger/Details" asp-route-txHash="@Model.Transaction.Hash" asp-route-ioIndex="@index" asp-route-ioType="output" asp-route-scriptType="1" class="button">Debug this script</a>
+                        }
+                        else
+                        {
+                            <a class="button" href="#" disabled>Debug this script</a>
+                        }
                         <Partial name="_DebuggerInfo" />
                     </div>
                 }
-
             }
             <div class="column is-12">
                 @if (typeScript != null)

diff --git a/src/Tippy/Tippy.csproj b/src/Tippy/Tippy.csproj
@@ -8,7 +8,7 @@
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
     <UserSecretsId>6e0dc08b-01f2-47f6-8249-66ed1b18f469</UserSecretsId>
-    <Version>0.3.1</Version>
+    <Version>0.3.2</Version>
     <PackageProjectUrl>https://github.com/nervosnetwork/tippy</PackageProjectUrl>
     <RepositoryUrl>https://github.com/nervosnetwork/tippy</RepositoryUrl>
     <Copyright>Copyright (c) Nervos Foundation</Copyright>

diff --git a/tools/osx/Info.plist b/tools/osx/Info.plist
@@ -9,9 +9,9 @@
     <key>CFBundleIconFile</key>
     <string>Tippy.icns</string>
     <key>CFBundleVersion</key>
-    <string>0.3.1</string>
+    <string>0.3.2</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.3.1</string>
+    <string>0.3.2</string>
     <key>CFBundleExecutable</key>
     <string>main</string>
     <key>CFBundleInfoDictionaryVersion</key>
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ public static void Open(string url) @@
                 }
                 catch
                 {
-                    Console.WriteLine($"Couldn't open URL $(url). Try opening it from your browser.");
+                    Console.WriteLine($"Couldn't open URL {url}. Try opening it from your browser.");
                 }
             }
         }
@@ Expand Down @@