Skip to content

Commit 9bd4b41

Browse files
committed
Fixes geerlingguy#91: Use updated requirements file format to fix lint error.
1 parent 331a403 commit 9bd4b41

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

.ansible-lint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
skip_list:
3+
- experimental

main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
- default.config.yml
66

77
pre_tasks:
8-
- include_vars: "{{ item }}"
8+
- name: Include playbook configuration.
9+
include_vars: "{{ item }}"
910
with_fileglob:
1011
- "{{ playbook_dir }}/config.yml"
1112
tags: ['always']

requirements.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2-
- name: geerlingguy.dotfiles
3-
- name: geerlingguy.homebrew
4-
- name: geerlingguy.mas
2+
roles:
3+
- name: geerlingguy.dotfiles
4+
- name: geerlingguy.homebrew
5+
- name: geerlingguy.mas

tasks/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
# TODO: Use sudo once .osx can be run via root with no user interaction.
33
- name: Run .osx dotfiles.
4-
shell: "{{ osx_script }}"
4+
command: "{{ osx_script }}"
55
changed_when: false

tasks/terminal.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
---
22
# Custom Terminal theme.
33
- name: Get current Terminal profile.
4-
shell: defaults read com.apple.terminal 'Default Window Settings'
4+
command: defaults read com.apple.terminal 'Default Window Settings'
55
register: terminal_theme
66
changed_when: false
77
check_mode: false
88

99
- name: Ensure custom Terminal profile is added.
10-
shell: open files/terminal/JJG-Term.terminal
10+
command: open files/terminal/JJG-Term.terminal
1111
changed_when: false
1212
when: "'JJG-Term' not in terminal_theme.stdout"
1313

1414
# TODO: This doesn't work in Yosemite. Consider a different solution?
1515
- name: Ensure custom Terminal profile is set as default.
16-
shell: "{{ item }}"
16+
command: "{{ item }}"
1717
with_items:
1818
- defaults write com.apple.terminal 'Default Window Settings' -string JJG-Term
1919
- defaults write com.apple.terminal 'Startup Window Settings' -string JJG-Term

0 commit comments

Comments
 (0)