Fix torrc path lookup under Linux

Fixes #3.
devlooped · May 19, 2021 · aad63c9 · aad63c9
1 parent 656d319
commit aad63c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/dotnet-tor/ConfigCommand.cs b/src/dotnet-tor/ConfigCommand.cs
@@ -37,10 +37,13 @@ async Task RunAsync()
             (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
             "notepad.exe" : "nano");
 
+        var zipName = Path.GetFileNameWithoutExtension(zipPath);
+        if (zipName.EndsWith(".tar"))
+            zipName = Path.GetFileNameWithoutExtension(zipName);
+
         var configPath = Path.Combine(
             settings.ExtractedToolsDirectory,
-            Path.GetFileNameWithoutExtension(zipPath),
-            "Data", "Tor", "torrc");
+            zipName, "Data", "Tor", "torrc");
 
         var torProxy = new TorSharpProxy(settings);
         await torProxy.ConfigureAsync();

diff --git a/src/dotnet-tor/TorCommand.cs b/src/dotnet-tor/TorCommand.cs
@@ -63,10 +63,13 @@ async Task RunAsync(int proxy, int socks, int control, CancellationToken cancell
         await tor.ConfigureAsync();
         cancellation.ThrowIfCancellationRequested();
 
+        var zipName = Path.GetFileNameWithoutExtension(zipPath);
+        if (zipName.EndsWith(".tar"))
+            zipName = Path.GetFileNameWithoutExtension(zipName);
+
         var configPath = Path.Combine(
             settings.ExtractedToolsDirectory,
-            Path.GetFileNameWithoutExtension(zipPath),
-            "Data", "Tor", "torrc");
+            zipName, "Data", "Tor", "torrc");
 
         if (!File.Exists(configPath))
             throw new ArgumentException($"Tor configuration file not found at expected location {configPath}");