Обновить playbooks/install_software_win.yml

playbooks/install_software_win.yml

@@ -27,20 +27,26 @@
 
   tasks:
     - name: Check running FreeCAD
-      ansible.windows.win_shell: |
+      ansible.windows.win_powershell:
-        Get-Process FreeCAD -IncludeUserName -ErrorAction SilentlyContinue |
+        script: |
-          ForEach-Object { "$($_.UserName) (session $($_.SessionId))" }
+          $Ansible.Failed = $false
+          $list = @(Get-CimInstance Win32_Process -Filter "Name = 'FreeCAD.exe'" -ErrorAction SilentlyContinue |
+            ForEach-Object {
+              $o = Invoke-CimMethod -InputObject $_ -MethodName GetOwner -ErrorAction SilentlyContinue
+              "$($o.Domain)\$($o.User) (session $($_.SessionId))"
+            })
+          $Ansible.Result = $list
       register: running
       changed_when: false
 
     - name: Fail if FreeCAD is running
       ansible.builtin.fail:
-        msg: "FreeCAD запущен у: {{ running.stdout_lines | join(', ') }}. Закройте его или включите force_close."
+        msg: "FreeCAD запущен у: {{ running.result | join(', ') }}. Закройте его или включите force_close."
-      when: running.stdout_lines | length > 0 and not (force_close | default(false) | bool)
+      when: running.result | length > 0 and not (force_close | default(false) | bool)
 
     - name: Force close FreeCAD
-      ansible.windows.win_shell: Stop-Process -Name FreeCAD -Force
+      ansible.windows.win_shell: Stop-Process -Name FreeCAD -Force -ErrorAction SilentlyContinue; exit 0
-      when: running.stdout_lines | length > 0 and (force_close | default(false) | bool)
+      when: running.result | length > 0 and (force_close | default(false) | bool)
 
     - name: Copy installer from share to local temp
       ansible.windows.win_powershell: