From 7bc5fc32fd95d66778b8bd16e1bc91649a8ead66 Mon Sep 17 00:00:00 2001 From: backspac Date: Sat, 25 Apr 2020 13:48:55 +0200 Subject: [PATCH 1/2] firecfg: Only use fix_desktop_files when --fix is specified --- src/firecfg/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/firecfg/main.c b/src/firecfg/main.c index 1e49a2fc746..d9b3f644f07 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c @@ -370,6 +370,7 @@ int main(int argc, char **argv) { return 0; } else if (strcmp(argv[i], "--fix") == 0) { + // fix .desktop files in ~/.local/share/applications directory fix_desktop_files(home); return 0; } @@ -486,8 +487,5 @@ int main(int argc, char **argv) { if (arg_debug) printf("%s %d %d %d %d\n", user, getuid(), getgid(), geteuid(), getegid()); - // fix .desktop files in ~/.local/share/applications directory - fix_desktop_files(home); - return 0; } From 2359fa901d6ac4a266ca2a1c0ddf31939a3a9863 Mon Sep 17 00:00:00 2001 From: backspac Date: Fri, 1 May 2020 10:22:11 +0200 Subject: [PATCH 2/2] firecfg: Only use fix_desktop_files automatically when run through sudo --- src/firecfg/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/firecfg/main.c b/src/firecfg/main.c index d9b3f644f07..0e520b0f17c 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c @@ -370,7 +370,6 @@ int main(int argc, char **argv) { return 0; } else if (strcmp(argv[i], "--fix") == 0) { - // fix .desktop files in ~/.local/share/applications directory fix_desktop_files(home); return 0; } @@ -487,5 +486,9 @@ int main(int argc, char **argv) { if (arg_debug) printf("%s %d %d %d %d\n", user, getuid(), getgid(), geteuid(), getegid()); + // if runs as regular user, fix .desktop files in ~/.local/share/applications directory + if (getuid() != 0) + fix_desktop_files(home); + return 0; }