Merge pull request #92 from OctopusDeploy/bug-scrmodvars

Ensure the ScriptModules are written after Variables.
OctopusDeploy · Feb 29, 2016 · 25c4524 · 25c4524
2 parents a615cd3 + 827e37b
commit 25c4524
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/source/Calamari/Integration/Scripting/WindowsPowerShell/Bootstrap.ps1 b/source/Calamari/Integration/Scripting/WindowsPowerShell/Bootstrap.ps1
@@ -128,6 +128,12 @@ Write-VersionTable
 
 {{VariableDeclarations}}
 
+# -----------------------------------------------------------------
+# Script Modules - after variables
+# -----------------------------------------------------------------
+
+{{ScriptModules}}
+
 # -----------------------------------------------------------------
 # Defaults
 # -----------------------------------------------------------------

diff --git a/source/Calamari/Integration/Scripting/WindowsPowerShell/PowerShellBootstrapper.cs b/source/Calamari/Integration/Scripting/WindowsPowerShell/PowerShellBootstrapper.cs
@@ -68,6 +68,7 @@ public static string PrepareBootstrapFile(string targetScriptFile, CalamariVaria
             var builder = new StringBuilder(BootstrapScriptTemplate);
             builder.Replace("{{TargetScriptFile}}", targetScriptFile.Replace("'", "''"));
             builder.Replace("{{VariableDeclarations}}", DeclareVariables(variables));
+            builder.Replace("{{ScriptModules}}", DeclareScriptModules(variables));
 
             using (var writer = new StreamWriter(bootstrapFile, false, new UTF8Encoding(true)))
             {
@@ -83,15 +84,22 @@ private static string DeclareVariables(CalamariVariableDictionary variables)
         {
             var output = new StringBuilder();
 
-            WriteScriptModules(variables, output);
-            output.AppendLine();
             WriteVariableDictionary(variables, output);
             output.AppendLine();
             WriteLocalVariables(variables, output);
 
             return output.ToString();
         }
 
+        private static string DeclareScriptModules(CalamariVariableDictionary variables)
+        {
+            var output = new StringBuilder();
+
+            WriteScriptModules(variables, output);
+
+            return output.ToString();
+        }
+
         static void WriteScriptModules(VariableDictionary variables, StringBuilder output)
         {
             foreach (var variableName in variables.GetNames().Where(SpecialVariables.IsLibraryScriptModule))