PIA_manager/Program.cs

@@ -107,10 +107,22 @@ private static void FindPiaFiles()
             Console.WriteLine($"Ruby files directory: {rubyFilesDir}");
 
             rubyExecutable = Path.Combine(rubyFilesDir, "bin", "rubyw.exe");
-            rubySourceFile = Path.Combine(rubyFilesDir, "src", "pia_manager.rb");
-
             if (!File.Exists(rubyExecutable)) throw new FileNotFoundException("Could not find ruby executable", rubyExecutable);
-            if (!File.Exists(rubySourceFile)) throw new FileNotFoundException("Could not find pia_manager ruby file", rubySourceFile);
+
+            var rubySourceFileOld = Path.Combine(rubyFilesDir, "src", "pia_manager.rb");
+            var rubySourceFileNew = Path.Combine(rubyFilesDir, "src", "bin", "pia_manager.rb");
+            if (File.Exists(rubySourceFileOld))
+            {
+                rubySourceFile = rubySourceFileOld;
+            }
+            else if (File.Exists(rubySourceFileNew))
+            {
+                rubySourceFile = rubySourceFileNew;
+            }
+            else
+            {
+                throw new FileNotFoundException("Could not find pia_manager ruby file", rubySourceFile);
+            }
         }
 
         static bool DirContainsPiaFiles(string searchDir)

README.md

@@ -1,3 +1,5 @@
+## Note: this program is no longer necessary with the modern PIA app, but I'm leaving this project up in case it's still useful to someone.
+
 # Purpose
 Every time the PIA VPN starts, it deploys some Ruby files to a random temp directory and then launches those. The random path prevents it from being whitelisted by firewalls. This program helps to run PIA from a fixed location so it can be whitelisted in firewalls.
 
@@ -11,4 +13,4 @@ Every time the PIA VPN starts, it deploys some Ruby files to a random temp direc
 # Usage
 Calling this program with no arguments will have it first kill any existing PIA processes and then start up PIA using the fixed `pia_ruby_files` location. If you had PIA set to automatically start with Windows before, that should continue to work - it will call `pia_manager.exe` with no arguments and PIA should start up as usual, but from this fixed path.
 
-If you call `pia_manager.exe` with the `--stop` argument, it will just kill any existing PIA processes. This may be useful for automation applications to give you a way to start/stop PIA at will.
+If you call `pia_manager.exe` with the `--stop` argument, it will just kill any existing PIA processes. This may be useful for automation applications to give you a way to start/stop PIA at will.