marcel/kinto
1
0
Fork 0
mirror of https://github.com/rbreaves/kinto.git synced 2025-08-02 00:56:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

- 3 Fixes, ibus install logic, kde-init not applying, display will always be set in systemd.

Browse Source
This commit is contained in:
Ben Reaves
2020-03-30 22:43:21 -05:00
parent 7013d81686
commit 39c40bc315
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keyswap_service.sh
View File

@@ -16,10 +16,10 @@ cp ./system-config/cleanup.sh ~/.config/kinto/cleanup.sh
cp ./system-config/.firefox-nw ~/.config/kinto/.firefox-nw cp ./system-config/.firefox-nw ~/.config/kinto/.firefox-nw
sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service
sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/systemd/user/keyswap.service sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/systemd/user/keyswap.service
if [ "${#DISPLAY}" -gt 2 ] # if [ "${#DISPLAY}" -gt 2 ]
then # then
sed -i "s/#Environment/Environment/g" ~/.config/systemd/user/keyswap.service sed -i "s/#Environment/Environment/g" ~/.config/systemd/user/keyswap.service
fi # fi
systemctl --user daemon-reload systemctl --user daemon-reload
sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
systemctl --user enable keyswap.timer systemctl --user enable keyswap.timer

6
setup.py
View File

@@ -86,11 +86,9 @@ if len(check_ibus) == 0:
if runpkg != 0: if runpkg != 0:
requirements(pkgm) requirements(pkgm)
if os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "": if not os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
install_ibus() install_ibus()
try: try:
f = open("defaults.json") f = open("defaults.json")
except IOError: except IOError:
@@ -215,7 +213,7 @@ if(onetime):
print(bcolors.CYELLOW + "Please enter your init tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC) print(bcolors.CYELLOW + "Please enter your init tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
defaultinit = [int(i) for i in input().split()] defaultinit = [int(i) for i in input().split()]
if len(defaultinit) != 0: if len(defaultinit) != 0:
user_config['init'] = defaultinit user_config['init'] = [intents[defaultinit[0]-1]['id']]
print("\nDynamic shortcut tweaks\n") print("\nDynamic shortcut tweaks\n")