From 3e7b65da2efb853f0654580ece6572cc10dab791 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Wed, 14 Sep 2022 17:36:01 +0000 Subject: discord: fix issues with command-line usage (#5368) * use both capitalized and regular discord commands to private-bin * use both capitalized and regular discord commands to private-bin * add awk and which to private-bin for better xdg-open support * use both capitalized and regular discord commands to private-bin * use both capitalized and regular discord commands to private-bin * refactor CamelCased discord profiles * refactor CamelCased discord profiles * fix private-{bin,opt} sorting * fix private-{bin,opt} sorting * unfuck private-{bin,opt} sorting * unfuck private-{bin,opt} sorting * fix sorting once more for CI * fix sorting once again for CI --- etc/profile-a-l/Discord.profile | 13 +++---------- etc/profile-a-l/DiscordCanary.profile | 13 +++---------- etc/profile-a-l/discord-canary.profile | 4 ++-- etc/profile-a-l/discord-common.profile | 2 +- etc/profile-a-l/discord.profile | 4 ++-- 5 files changed, 11 insertions(+), 25 deletions(-) (limited to 'etc/profile-a-l') diff --git a/etc/profile-a-l/Discord.profile b/etc/profile-a-l/Discord.profile index 3f274b21c..68fcf157f 100644 --- a/etc/profile-a-l/Discord.profile +++ b/etc/profile-a-l/Discord.profile @@ -3,15 +3,8 @@ # Persistent local customizations include Discord.local # Persistent global definitions -include globals.local - -noblacklist ${HOME}/.config/discord - -mkdir ${HOME}/.config/discord -whitelist ${HOME}/.config/discord - -private-bin Discord -private-opt Discord +# added by included profile +#include globals.local # Redirect -include discord-common.profile +include discord.profile diff --git a/etc/profile-a-l/DiscordCanary.profile b/etc/profile-a-l/DiscordCanary.profile index d24e73ed8..ee6576955 100644 --- a/etc/profile-a-l/DiscordCanary.profile +++ b/etc/profile-a-l/DiscordCanary.profile @@ -3,15 +3,8 @@ # Persistent local customizations include DiscordCanary.local # Persistent global definitions -include globals.local - -noblacklist ${HOME}/.config/discordcanary - -mkdir ${HOME}/.config/discordcanary -whitelist ${HOME}/.config/discordcanary - -private-bin DiscordCanary -private-opt DiscordCanary +# added by included profile +#include globals.local # Redirect -include discord-common.profile +include discord-canary.profile diff --git a/etc/profile-a-l/discord-canary.profile b/etc/profile-a-l/discord-canary.profile index 43db95b8a..245b07b8d 100644 --- a/etc/profile-a-l/discord-canary.profile +++ b/etc/profile-a-l/discord-canary.profile @@ -10,8 +10,8 @@ noblacklist ${HOME}/.config/discordcanary mkdir ${HOME}/.config/discordcanary whitelist ${HOME}/.config/discordcanary -private-bin discord-canary,electron,electron[0-9],electron[0-9][0-9] -private-opt discord-canary +private-bin discord-canary,DiscordCanary +private-opt discord-canary,DiscordCanary # Redirect include discord-common.profile diff --git a/etc/profile-a-l/discord-common.profile b/etc/profile-a-l/discord-common.profile index c04e38899..bf49c8d48 100644 --- a/etc/profile-a-l/discord-common.profile +++ b/etc/profile-a-l/discord-common.profile @@ -23,7 +23,7 @@ ignore novideo whitelist ${HOME}/.config/BetterDiscord whitelist ${HOME}/.local/share/betterdiscordctl -private-bin bash,cut,echo,egrep,electron,electron[0-9],electron[0-9][0-9],fish,grep,head,sed,sh,tclsh,tr,xdg-mime,xdg-open,zsh +private-bin awk,bash,cut,echo,egrep,electron,electron[0-9],electron[0-9][0-9],fish,grep,head,sed,sh,tclsh,tr,which,xdg-mime,xdg-open,zsh private-etc alternatives,ca-certificates,crypto-policies,fonts,group,ld.so.cache,ld.so.preload,localtime,login.defs,machine-id,password,pki,pulse,resolv.conf,ssl join-or-start discord diff --git a/etc/profile-a-l/discord.profile b/etc/profile-a-l/discord.profile index 8ef02a30f..02d1c65cd 100644 --- a/etc/profile-a-l/discord.profile +++ b/etc/profile-a-l/discord.profile @@ -10,8 +10,8 @@ noblacklist ${HOME}/.config/discord mkdir ${HOME}/.config/discord whitelist ${HOME}/.config/discord -private-bin discord -private-opt discord +private-bin discord,Discord +private-opt discord,Discord # Redirect include discord-common.profile -- cgit v1.2.3-70-g09d2