(chocolateyGH-268) Revert removed fixes

- Adding back in chocolateyGH-560 - loading modules from known location (90d53ee) - Adding back in chocolateyGH-542 - not running templated scripts (d5f09bf)
ferventcoder · Apr 9, 2016 · 4a9bc73 · 4a9bc73
1 parent 43c6d10
commit 4a9bc73
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/chocolatey/infrastructure.app/services/PowershellService.cs b/src/chocolatey/infrastructure.app/services/PowershellService.cs
@@ -75,8 +75,13 @@ private string get_script_for_action(PackageResult packageResult, CommandNameTyp
             }
 
             var packageDirectory = packageResult.InstallLocation;
-            var installScript = _fileSystem.get_files(packageDirectory, file, SearchOption.AllDirectories).FirstOrDefault();
-            return installScript;
+            var installScript = _fileSystem.get_files(packageDirectory, file, SearchOption.AllDirectories).Where(p => !p.to_lower().contains("\\templates\\"));
+            if (installScript.Count() != 0)
+            {
+                return installScript.FirstOrDefault();
+            }
+
+            return string.Empty;
         }
 
         public void noop_action(PackageResult packageResult, CommandNameType command)
@@ -126,10 +131,9 @@ private string get_helpers_folder()
 
         public string wrap_script_with_module(string script, ChocolateyConfiguration config)
         {
-            var installerModules = _fileSystem.get_files(ApplicationParameters.InstallLocation, "chocolateyInstaller.psm1", SearchOption.AllDirectories);
-            var installerModule = installerModules.FirstOrDefault();
-            var scriptRunners = _fileSystem.get_files(ApplicationParameters.InstallLocation, "chocolateyScriptRunner.ps1", SearchOption.AllDirectories);
-            var scriptRunner = scriptRunners.FirstOrDefault();
+            var installerModule = _fileSystem.combine_paths(get_helpers_folder(), "chocolateyInstaller.psm1");
+            var scriptRunner = _fileSystem.combine_paths(get_helpers_folder(), "chocolateyScriptRunner.ps1");
+
             // removed setting all errors to terminating. Will cause too
             // many issues in existing packages, including upgrading
             // Chocolatey from older POSH client due to log errors