Skip to content

Commit

Permalink
Allowed for installation on OSX using pre-fetched package
Browse files Browse the repository at this point in the history
  • Loading branch information
George McIntosh committed Jul 20, 2017
1 parent 9349410 commit 3e399a9
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
copy:
src: "{{ playbook_dir }}/files/{{ jdk_tarball_file }}.tar.gz"
dest: "{{ java_download_path }}/{{ jdk_tarball_file }}.tar.gz"
when: ansible_pkg_mgr != "yum" and ansible_pkg_mgr != "zypper"
when: ansible_pkg_mgr != "yum" and ansible_pkg_mgr != "zypper" and ansible_os_family != "Darwin"

- name: copy .dmg from local
copy:
src: "{{ playbook_dir }}/files/{{ jdk_tarball_file }}.dmg"
dest: "{{ java_download_path }}/{{ jdk_tarball_file }}.dmg"
when: ansible_pkg_mgr != "yum" and ansible_pkg_mgr != "zypper" and ansible_os_family == "Darwin"

when: not java_download_from_oracle

Expand Down

0 comments on commit 3e399a9

Please sign in to comment.