From a28134e0b1a4951f9c1bd4836628a24b48257ffc Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Sun, 30 Jun 2019 20:05:03 +0000 Subject: Change include/redirect logic in autokey profiles (#2814) * Change redirect logic * Change redirect logic * Change redirect logic * Change redirect logic * Change redirect logic --- etc/autokey-common.profile | 3 ++- etc/autokey-gtk.profile | 3 +-- etc/autokey-qt.profile | 3 +-- etc/autokey-run.profile | 3 +-- etc/autokey-shell.profile | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/etc/autokey-common.profile b/etc/autokey-common.profile index bd50a2dfb..b1a77c0a4 100644 --- a/etc/autokey-common.profile +++ b/etc/autokey-common.profile @@ -4,7 +4,8 @@ # Persistent local customizations include autokey-common.local # Persistent global definitions -include globals.local +# added by caller profile +#include globals.local noblacklist ${HOME}/.config/autokey noblacklist ${HOME}/.local/share/autokey diff --git a/etc/autokey-gtk.profile b/etc/autokey-gtk.profile index 7e398fc6b..e16449064 100644 --- a/etc/autokey-gtk.profile +++ b/etc/autokey-gtk.profile @@ -4,8 +4,7 @@ # Persistent local customizations include autokey-gtk.local # Persistent global definitions -# added by included profile -#include globals.local +include globals.local # Redirect include autokey-common.profile diff --git a/etc/autokey-qt.profile b/etc/autokey-qt.profile index 1a2365681..b6f1210dd 100644 --- a/etc/autokey-qt.profile +++ b/etc/autokey-qt.profile @@ -4,8 +4,7 @@ # Persistent local customizations include autokey-qt.local # Persistent global definitions -# added by included profile -#include globals.local +include globals.local # Redirect include autokey-common.profile diff --git a/etc/autokey-run.profile b/etc/autokey-run.profile index dca1f4548..05669351a 100644 --- a/etc/autokey-run.profile +++ b/etc/autokey-run.profile @@ -4,8 +4,7 @@ # Persistent local customizations include autokey-run.local # Persistent global definitions -# added by included profile -#include globals.local +include globals.local # Redirect include autokey-common.profile diff --git a/etc/autokey-shell.profile b/etc/autokey-shell.profile index def5809c2..dfbd8759f 100644 --- a/etc/autokey-shell.profile +++ b/etc/autokey-shell.profile @@ -4,8 +4,7 @@ # Persistent local customizations include autokey-shell.local # Persistent global definitions -# added by included profile -#include globals.local +include globals.local # Redirect include autokey-common.profile -- cgit v1.2.3-54-g00ecf