Skip to content

Commit a5594d7

Browse files
committed
Fixes lint
1 parent 09fd255 commit a5594d7

5 files changed

Lines changed: 37 additions & 30 deletions

File tree

ansible/roles/fzf/tasks/windows.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
winget_package: junegunn.fzf
77

88
- name: Install PSReadLine via PowerShell
9-
ansible.windows.win_powershell: |
10-
Install-Module PSReadLine -AcceptLicense -Confirm
9+
ansible.windows.win_powershell:
10+
script: |
11+
Install-Module PSReadLine -AcceptLicense -Confirm
1112
1213
- name: Install PSfzf via PowerShell
13-
ansible.windows.win_powershell: |
14-
Install-Module PSfzf -AcceptLicense -Confirm
14+
ansible.windows.win_powershell:
15+
script: |
16+
Install-Module PSfzf -AcceptLicense -Confirm
1517
1618
- name: "Deploy fzf powershell aliases files"
1719
ansible.windows.win_copy:
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
- name: Change PowerShell execution policy
3-
ansible.windows.win_powershell: |
4-
Set-ExecutionPolicy RemoteSigned -Force -Scope CurrentUser
5-
$CurrentPolicy = Get-ExecutionPolicy
6-
Write-Host ($CurrentPolicy -eq 'RemoteSigned')
3+
ansible.windows.win_powershell:
4+
script: |
5+
Set-ExecutionPolicy RemoteSigned -Force -Scope CurrentUser
6+
$CurrentPolicy = Get-ExecutionPolicy
7+
Write-Host ($CurrentPolicy -eq 'RemoteSigned')
78
register: ps_exec_result
89
changed_when: ps_exec_result.stdout != 'True'

ansible/setup/detect_host_user.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: Detect current user when in Windows Subsystem for Linux
3-
ansible.windows.win_powershell: $env:UserName
3+
ansible.windows.win_powershell:
4+
script: $env:UserName
45
register: username
56
changed_when: false
67
failed_when: username.rc != 0

ansible/setup/detect_powershell_directory.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: Detect current user when in Windows Subsystem for Linux
3-
ansible.windows.win_powershell: $PSHOME
3+
ansible.windows.win_powershell:
4+
script: $PSHOME
45
register: powershell_directory
56
changed_when: false
67
failed_when: powershell_directory.rc != 0

ansible/setup/ensure_winget_installed.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,33 @@
88
ignore_errors: true
99

1010
- name: Install Winget Package Manager
11-
ansible.windows.win_powershell: |
12-
$installed = Get-AppPackage -name "Microsoft.DesktopAppInstaller"
13-
if (-Not($installed)) {
14-
$releases_url = "https://api.github.com/repos/microsoft/winget-cli/releases/latest"
15-
$releases = Invoke-RestMethod -uri "$($releases_url)"
16-
$latestRelease = $releases.assets | Where { $_.browser_download_url.EndsWith("msixbundle") } | Select -First 1
17-
Add-AppxPackage -Path $latestRelease.browser_download_url
18-
} else {
19-
$false
20-
}
11+
ansible.windows.win_powershell:
12+
script: |
13+
$installed = Get-AppPackage -name "Microsoft.DesktopAppInstaller"
14+
if (-Not($installed)) {
15+
$releases_url = "https://api.github.com/repos/microsoft/winget-cli/releases/latest"
16+
$releases = Invoke-RestMethod -uri "$($releases_url)"
17+
$latestRelease = $releases.assets | Where { $_.browser_download_url.EndsWith("msixbundle") } | Select -First 1
18+
Add-AppxPackage -Path $latestRelease.browser_download_url
19+
} else {
20+
$false
21+
}
2122
register: install_winget_result
2223
changed_when: install_winget_result.stdout != 'False'
2324

2425
- name: Install {{ winget_package }} using Winget Package Manager
25-
ansible.windows.win_powershell: |
26-
$needed = [bool](winget list {{ winget_package }})[-1].Contains('No installed package')
27-
If ($needed) {
28-
winget install -e --id {{ winget_package }}
29-
$stillNeeded = [bool](winget list {{ winget_package }})[-1].Contains('No installed package')
30-
If ($stillNeeded) {
31-
$Ansible.Failed = $true
26+
ansible.windows.win_powershell:
27+
script: |
28+
$needed = [bool](winget list {{ winget_package }})[-1].Contains('No installed package')
29+
If ($needed) {
30+
winget install -e --id {{ winget_package }}
31+
$stillNeeded = [bool](winget list {{ winget_package }})[-1].Contains('No installed package')
32+
If ($stillNeeded) {
33+
$Ansible.Failed = $true
34+
}
35+
} else {
36+
$false
3237
}
33-
} else {
34-
$false
35-
}
3638
register: winget_install_result
3739
changed_when: winget_install_result.stdout != 'False'
3840
when: winget_package is defined

0 commit comments

Comments
 (0)