Przeglądaj źródła

Fixed for alfred-json role

Till Klocke 9 lat temu
rodzic
commit
df166ee1a2

+ 4 - 1
roles/alfred-json/defaults/main.yml

@@ -3,4 +3,7 @@
 alfred_json_repo_url: https://github.com/tcatm/alfred-json.git
 alfred_json_version: v0.3.1
 alfred_json_src_dir: /usr/src/alfred-json
-alfred_json_build_dir: /usr/src/alfred-json-build
+alfred_json_build_dir: /usr/src/alfred-json-build
+
+alfred_json_build_deps:
+- blah

+ 3 - 6
roles/alfred-json/tasks/main.yml

@@ -1,14 +1,11 @@
 ---
 # tasks file for alfred-json
 
+- include_vars: "{{ ansible_os_family }}.yml"
+
 - name: Install build dependencies
   apt: name={{item}} state=present
-  with_items:
-  - cmake
-  - build-essential
-  - git
-  - libjansson-dev
-  - libjansson4
+  with_items: "{{alfred_json_build_deps}}"
 
 - name: Create directories for clone and build
   file: dest={{item}} state=directory

+ 7 - 0
roles/alfred-json/vars/Debian.yml

@@ -0,0 +1,7 @@
+alfred_json_build_deps:
+- cmake
+- build-essential
+- git
+- libjansson-dev
+- libjansson4
+- zlib1g-dev