Skip to content

Commit

Permalink
fix(snap): removes more snap left-overs
Browse files Browse the repository at this point in the history
References #330
  • Loading branch information
smoyer64 committed Jul 5, 2024
1 parent 1fb8d55 commit bb8774c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 53 deletions.
9 changes: 0 additions & 9 deletions roles/clean/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@
tags:
- clean-legacy

- name: remove the snap-managed kubectl
snap:
name: kubectl
state: absent
classic: true
register: kubectl_result
tags:
- clean-legacy

- name: remove tools previously installed via apt (now installed via asdf)
apt:
pkg:
Expand Down
54 changes: 16 additions & 38 deletions roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@
autoremove: "yes"
state: "latest"

# Mint does not ship with snap

- name: "remove all traces of snap"
apt:
name:
- "snapd"
- "gnome-software-plugin-snap"
state: "absent"
purge: "yes"
tags:
- "snap"

- name: "add the PIP package manager"
apt:
name: "{{ packages }}"
Expand Down Expand Up @@ -56,7 +44,6 @@
- "screen"
- "seahorse"
- "secure-delete"
- "snapd"
- "sshfs"
- "sshuttle"
- "stacer"
Expand Down Expand Up @@ -92,7 +79,7 @@

- name: add the Dell repository
apt_repository:
repo: "deb http://dell.archive.canonical.com/updates/ focal-dell public"
repo: "deb http://dell.archive.canonical.com/updates/ jammy-dell public"
state: "present"
mode: "644"
when: ansible_system_vendor == "Dell Inc."
Expand All @@ -101,7 +88,7 @@

# - name: add the Dell source repository
# apt_repository:
# repo: "deb-src http://dell.archive.canonical.com/updates/ focal-dell public"
# repo: "deb-src http://dell.archive.canonical.com/updates/ jammy-dell public"
# state: "present"
# mode: "644"
# when: ansible_system_vendor == "Dell Inc."
Expand All @@ -110,7 +97,7 @@

- name: add the Dell oem repository
apt_repository:
repo: "deb http://dell.archive.canonical.com/updates/ focal-oem public"
repo: "deb http://dell.archive.canonical.com/updates/ jammy-oem public"
state: "present"
mode: "644"
when: ansible_system_vendor == "Dell Inc."
Expand All @@ -119,7 +106,7 @@

# - name: add the Dell oem source repository
# apt_repository:
# repo: "deb-src http://dell.archive.canonical.com/updates/ focal-oem public"
# repo: "deb-src http://dell.archive.canonical.com/updates/ jammy-oem public"
# state: "present"
# mode: "644"
# when: ansible_system_vendor == "Dell Inc."
Expand All @@ -128,7 +115,7 @@

- name: add the Dell somerville repository
apt_repository:
repo: "deb http://dell.archive.canonical.com/updates/ focal-somerville public"
repo: "deb http://dell.archive.canonical.com/updates/ jammy-somerville public"
state: "present"
mode: "644"
when: ansible_system_vendor == "Dell Inc."
Expand All @@ -137,7 +124,7 @@

# - name: add the Dell somerville source repository
# apt_repository:
# repo: "deb-src http://dell.archive.canonical.com/updates/ focal-somerville public"
# repo: "deb-src http://dell.archive.canonical.com/updates/ jammy-somerville public"
# state: "present"
# mode: "644"
# when: ansible_system_vendor == "Dell Inc."
Expand All @@ -146,7 +133,7 @@

- name: add the Dell somerville-melisa repository
apt_repository:
repo: "deb http://dell.archive.canonical.com/updates/ focal-somerville-melisa public"
repo: "deb http://dell.archive.canonical.com/updates/ jammy-somerville-melisa public"
state: "present"
mode: "644"
when: ansible_system_vendor == "Dell Inc."
Expand All @@ -155,14 +142,14 @@

# - name: add the Dell somerville-melisa source repository
# apt_repository:
# repo: "deb-src http://dell.archive.canonical.com/updates/ focal-somerville-melisa public"
# repo: "deb-src http://dell.archive.canonical.com/updates/ jammy-somerville-melisa public"
# state: "present"
# mode: "644"
# when: ansible_system_vendor == "Dell Inc."
# tags:
# - dell

# Add support for biometrics
# Add support for biometrics - see: https://github.com/Am0rphous/Shenzhen-Goodix-Fingerprint-Reader-

- name: install tools and libraries for biometrics
apt:
Expand All @@ -189,22 +176,13 @@
- biometrics
- dell

- name: remove the freemind installed by snap
snap:
name: freemind
state: absent
# classic: true
tags:
- freemind
- clean-legacy

- name: copy the freemind icon
file:
path: /snap/bin/freemind.png
state: absent
tags:
- freemind
- clean-legacy
# - name: copy the freemind icon
# file:
# path: /snap/bin/freemind.png
# state: absent
# tags:
# - freemind
# - clean-legacy

- name: add the freemind desktop item to the menu
file:
Expand Down
6 changes: 0 additions & 6 deletions roles/development/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,6 @@
- "build-tools"
- "make"

- name: "remove protobuf compiler"
snap:
name: "protobuf"
state: "absent"
tags:
- "protobuf"

#
# File formating tools
Expand Down

0 comments on commit bb8774c

Please sign in to comment.