diff -r 40cf9093ef45 -r 259484b0fc75 scripts/uninstall.py
--- a/scripts/uninstall.py Sat Apr 17 18:46:26 2021 +0200
+++ b/scripts/uninstall.py Sun Apr 18 12:20:14 2021 +0200
@@ -248,10 +248,6 @@
Uninstall Linux specific files.
"""
if os.getuid() == 0:
- for name in ["/usr/share/pixmaps/eric.png",
- "/usr/share/pixmaps/ericWeb.png"]:
- if os.path.exists(name):
- os.remove(name)
for name in [
"/usr/share/applications/eric6.desktop",
"/usr/share/appdata/eric6.appdata.xml",
@@ -259,6 +255,8 @@
"/usr/share/applications/eric6_browser.desktop",
"/usr/share/pixmaps/eric.png",
"/usr/share/pixmaps/ericWeb.png",
+ "/usr/share/icons/eric.png",
+ "/usr/share/icons/ericWeb.png",
# from Python2 era
"/usr/share/applications/eric6_webbrowser.desktop",
]:
@@ -266,11 +264,6 @@
os.remove(name)
elif os.getuid() >= 1000:
# it is assumed that user ids start at 1000
- for name in ["~/.local/share/pixmaps/eric.png",
- "~/.local/share/pixmaps/ericWeb.png"]:
- path = os.path.expanduser(name)
- if os.path.exists(path):
- os.remove(path)
for name in [
"~/.local/share/applications/eric6.desktop",
"~/.local/share/appdata/eric6.appdata.xml",
@@ -278,6 +271,8 @@
"~/.local/share/applications/eric6_browser.desktop",
"~/.local/share/pixmaps/eric.png",
"~/.local/share/pixmaps/ericWeb.png",
+ "~/.local/share/icons/eric.png",
+ "~/.local/share/icons/ericWeb.png",
# from Python2 era
"/usr/share/applications/eric6_webbrowser.desktop",
]:
