Update to Get-TaskDetail and Set-PowerShell-Format

Author: david-brett

.gitignore

@@ -1,7 +1,8 @@
 # bretty.me.uk Defined
 
-# Local Testing for XML File Generation
+# Local Testing for XML File Generation and Local PS1 File Testing
 *.xml
+*.ps1
 
 #VSCode
 

CitrixOptimizerAutomation/Private/Get-TaskDetail.ps1

@@ -41,17 +41,25 @@ begin {
 process {
 
     # Trim any Trailing \ chatacters
-    $TaskTrimmed = $TaskPath.Substring(0,$TaskPath.Length - 1)
+    if($TaskPath -notmatch '\\$'){
+        $TaskTrimmed = $TaskPath.Substring(0,$TaskPath.Length)
+    } else {
+        $TaskTrimmed = $TaskPath.Substring(0,$TaskPath.Length - 1)
+    }
 
+    if(!($TaskTrimmed.StartsWith("\"))){
+        $TaskTrimmed = "\$($TaskTrimmed)"
+    }
+
     # Get The Task Name
     $TaskName = $TaskTrimmed.Substring($TaskTrimmed.lastIndexOf('\') + 1)
 
     # Get The Task Path 
-    $TaskPath = $TaskTrimmed.Substring(0,$TaskTrimmed.lastIndexOf('\') + 1)
+    $TaskPathReturn = $TaskTrimmed.Substring(0,$TaskTrimmed.lastIndexOf('\') + 1)
 
     # Build the Return Object
     $Return | Add-Member -MemberType NoteProperty -Name "TaskName" -Value $TaskName
-    $Return | Add-Member -MemberType NoteProperty -Name "TaskPath" -Value $TaskPath
+    $Return | Add-Member -MemberType NoteProperty -Name "TaskPath" -Value $TaskPathReturn
 
 } # process
 

CitrixOptimizerAutomation/Private/Set-PowerShellFormat.ps1

@@ -47,12 +47,12 @@ process {
     }
 
     # Add the true return value
-    $FormattedScript = $FormattedScript + "`t`t" + '$Global' + ":CTXOE_Details = " + "Complete;`n"
+    $FormattedScript = $FormattedScript + "`t`t" + '$Global' + ":CTXOE_Details = " + """Complete"";`n"
     $FormattedScript = $FormattedScript + "`t`t" + '$Global' + ":CTXOE_Result = " + '$True;' + "`n"
     $FormattedScript = $FormattedScript + "`t} catch {`n"
 
     # Add the false return value
-    $FormattedScript = $FormattedScript + "`t`t" + '$Global' + ":CTXOE_Details = " + "Errored;`n"
+    $FormattedScript = $FormattedScript + "`t`t" + '$Global' + ":CTXOE_Details = " + """Errored"";`n"
     $FormattedScript = $FormattedScript + "`t`t" + '$Global' + ":CTXOE_Result = " + '$False;' + "`n"
     $FormattedScript = $FormattedScript + "`t}`n"
 

CitrixOptimizerAutomation/Public/New-CitrixTemplateScript.ps1

@@ -142,7 +142,6 @@ process {
 
                                 # Write the PowerShell Formatted Script
                                 $ParamValue = $XMLFile.CreateElement("value")
-                                $ParamValue.InnerText = $FinalScript
                                 $ParamValue.AppendChild($XMLFile.CreateCDataSection($FinalScript))
                                 $Params.AppendChild($ParamValue)