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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Ben Reaves
2020-02-29 03:13:22 -06:00
parent 5003d6fa9b 40b521ce09
commit 92b4315da7
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
keyswap_service.sh
View File

@@ -4,8 +4,6 @@ systemctl --user stop keyswap >/dev/null 2>&1
systemctl --user disable keyswap >/dev/null 2>&1 systemctl --user disable keyswap >/dev/null 2>&1
systemctl --user stop keyswap.timer >/dev/null 2>&1 systemctl --user stop keyswap.timer >/dev/null 2>&1
systemctl --user disable keyswap.timer >/dev/null 2>&1 systemctl --user disable keyswap.timer >/dev/null 2>&1
swapcmd="\/bin\/bash -c \"\/home\/`whoami`\/.config\/kinto\/xactive.sh carrots\""
swapstopcmd="\/bin\/bash \/home\/`whoami`\/.config\/kinto\/cleanup.sh"
mkdir -p ~/.config/systemd/user mkdir -p ~/.config/systemd/user
mkdir -p ~/.config/autostart mkdir -p ~/.config/autostart
cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
@@ -16,6 +14,11 @@ cp ./system-config/caret_status.sh ~/.config/kinto/caret_status.sh
cp ./system-config/cleanup.sh ~/.config/kinto/cleanup.sh 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
if [ "${#DISPLAY}" -gt 2 ]
then
sed -i "s/#Environment/Environment/g" ~/.config/systemd/user/keyswap.service
fi
systemctl --user daemon-reload systemctl --user daemon-reload
systemctl --user enable keyswap systemctl --user enable keyswap
systemctl --user start keyswap systemctl --user start keyswap

3
setup.py
View File

@@ -33,7 +33,8 @@ def install_ibus():
input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...")
sys.exit() sys.exit()
check_x11 = cmdline("env | grep -i x11").strip() # check_x11 = cmdline("env | grep -i x11").strip()
check_x11 = cmdline("env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type | awk -F= '{print $2}'").strip()
if len(check_x11) == 0: if len(check_x11) == 0:
print("You are not using x11, please logout and back in using x11/Xorg") print("You are not using x11, please logout and back in using x11/Xorg")

3
system-config/keyswap.service
View File

@@ -5,7 +5,8 @@ PartOf=graphical-session.target
[Service] [Service]
Type=simple Type=simple
Restart=always Restart=always
#Environment=DISPLAY=:0.0 # eg DISPLAY=:0.0
#Environment=DISPLAY={displayid}
RestartSec=1 RestartSec=1
WorkingDirectory=/home/{username}/.config/kinto WorkingDirectory=/home/{username}/.config/kinto
ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots" ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots"