Skip to content

Commit 15d2da0

Browse files
authored
Merge pull request #42 from cwardgar/remove-license-check
Remove 'debian | ubuntu | check if oracle license is already accepted'
2 parents 58c0a90 + 892f283 commit 15d2da0

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

tasks/debian/main.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,11 @@
44
# Task file to install Oracle Java Development Kit in a system with a Debian based Linux distribution.
55
#
66

7-
- block:
8-
- name: debian | ubuntu | add java ppa repo
9-
apt_repository:
10-
repo=ppa:webupd8team/java
11-
state=present
12-
become: yes
13-
14-
- name: debian | ubuntu | check if oracle license is already accepted
15-
shell: debconf-get-selections |grep "oracle-java{{ oracle_java_version }}-installer\sshared/accepted-oracle-license-v1-1\sboolean\strue"
16-
register: licence_not_accepted
17-
failed_when: false
18-
changed_when: licence_not_accepted.rc != 0
19-
become: yes
20-
7+
- name: debian | ubuntu | add java ppa repo
8+
apt_repository:
9+
repo=ppa:webupd8team/java
10+
state=present
11+
become: yes
2112
when: ansible_distribution == 'Ubuntu'
2213

2314
- block:
@@ -42,7 +33,6 @@
4233

4334
- name: debian | set license as accepted
4435
debconf: name='oracle-java{{ oracle_java_version }}-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select'
45-
when: licence_not_accepted|changed or licence_not_accepted|skipped
4636
become: yes
4737

4838
- name: debian | ensure Java is installed

0 commit comments

Comments
 (0)