Merge pull request #3027 from vexx32/2953-cygwin

(#2953, #3026) Ensure CygwinService can find the correct RootDirectory
chocolatey · Feb 15, 2023 · d2db589 · d2db589
2 parents ebebe3c + 7de4e6a
commit d2db589
Showing 1 changed file with 33 additions and 14 deletions.
diff --git a/src/chocolatey/infrastructure.app/services/CygwinService.cs b/src/chocolatey/infrastructure.app/services/CygwinService.cs
@@ -45,7 +45,20 @@ public sealed class CygwinService : ISourceRunner
         private const string PACKAGE_NAME_TOKEN = "{{packagename}}";
         private const string INSTALL_ROOT_TOKEN = "{{installroot}}";
         public const string CYGWIN_PACKAGE = "cygwin";
-        private string _rootDirectory = string.Empty;
+
+        private string _rootDirectory;
+        private string RootDirectory
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(_rootDirectory))
+                {
+                    _rootDirectory = get_root_directory();
+                }
+
+                return _rootDirectory;
+            }
+        }
 
         private const string APP_NAME = "Cygwin";
         public const string PACKAGE_NAME_GROUP = "PkgName";
@@ -156,34 +169,39 @@ public void ensure_source_app_installed(ChocolateyConfiguration config, Action<P
                 _nugetService.install_run(runnerConfig, ensureAction.Invoke);
                 config.PromptForConfirmation = prompt;
             }
-
-            set_root_dir_if_not_set();
         }
 
         public int count_run(ChocolateyConfiguration config)
         {
             throw new NotImplementedException("Count is not supported for this source runner.");
         }
 
+        [Obsolete("This method does not need to be called publicly and may be made private or removed in a later version.")]
         public void set_root_dir_if_not_set()
         {
-            if (!string.IsNullOrWhiteSpace(_rootDirectory)) return;
+            if (!string.IsNullOrWhiteSpace(_rootDirectory))
+            {
+                return;
+            }
+
+            _rootDirectory = get_root_directory();
+        }
 
+        private string get_root_directory()
+        {
             var setupKey = _registryService.get_key(RegistryHive.LocalMachine, "SOFTWARE\\Cygwin\\setup");
             if (setupKey != null)
             {
-                _rootDirectory = setupKey.GetValue("rootdir", string.Empty).to_string();
+                return setupKey.GetValue("rootdir", string.Empty).to_string();
             }
 
-            if (string.IsNullOrWhiteSpace(_rootDirectory))
-            {
-                var binRoot = Environment.GetEnvironmentVariable("ChocolateyBinRoot");
-                if (string.IsNullOrWhiteSpace(binRoot)) binRoot = "c:\\tools";
+            var binRoot = Environment.GetEnvironmentVariable("ChocolateyBinRoot");
+            if (string.IsNullOrWhiteSpace(binRoot)) binRoot = "c:\\tools";
 
-                _rootDirectory = _fileSystem.combine_paths(binRoot, "cygwin");
-            }
+            return _fileSystem.combine_paths(binRoot, "cygwin");
         }
 
+        [Obsolete("This method does not need to be called publicly and may be made private or removed in a later version.")]
         public string get_exe(string rootpath)
         {
             return _fileSystem.combine_paths(rootpath, "cygwinsetup.exe");
@@ -199,19 +217,20 @@ public IEnumerable<PackageResult> list_run(ChocolateyConfiguration config)
             throw new NotImplementedException("{0} does not implement list".format_with(APP_NAME));
         }
 
+        [Obsolete("This method does not need to be called publicly and may be made private or removed in a later version.")]
         public string build_args(ChocolateyConfiguration config, IDictionary<string, ExternalCommandArgument> argsDictionary)
         {
             var args = ExternalCommandArgsBuilder.build_arguments(config, argsDictionary);
 
-            args = args.Replace(INSTALL_ROOT_TOKEN, _rootDirectory);
+            args = args.Replace(INSTALL_ROOT_TOKEN, RootDirectory);
 
             return args;
         }
 
         public void install_noop(ChocolateyConfiguration config, Action<PackageResult> continueAction)
         {
             var args = build_args(config, _installArguments);
-            this.Log().Info("Would have run '{0} {1}'".format_with(get_exe(_rootDirectory).escape_curly_braces(), args.escape_curly_braces()));
+            this.Log().Info("Would have run '{0} {1}'".format_with(get_exe(RootDirectory).escape_curly_braces(), args.escape_curly_braces()));
         }
 
         public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfiguration config, Action<PackageResult> continueAction)
@@ -224,7 +243,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
                 var argsForPackage = args.Replace(PACKAGE_NAME_TOKEN, packageToInstall);
 
                 var exitCode = _commandExecutor.execute(
-                    get_exe(_rootDirectory),
+                    get_exe(RootDirectory),
                     argsForPackage,
                     config.CommandExecutionTimeoutSeconds,
                     _fileSystem.get_current_directory(),