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

- Fix syntax error in install script, fixed bug in xactive where keyswap may not be trigger if process id was not exactly 7 integers long, it now accepts integers of any length.

Browse Source
This commit is contained in:
Ben Reaves
2019-07-30 13:49:44 -05:00
parent e72ced64ef
commit 2385d4e635
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install.py
View File

@@ -76,7 +76,7 @@ def keyboard_detect():
print("systemctl --user disable keyswap") print("systemctl --user disable keyswap")
print("rm -rf ~/.config/autostart/keyswap.sh") print("rm -rf ~/.config/autostart/keyswap.sh")
print("rm -rf ~/.config/xactive.sh") print("rm -rf ~/.config/xactive.sh")
keyswapcmd = '/bin/bash -c "./keyswap_service.sh 1 0 ' + system_type + ' ' + str(internalid).strip() + ' ' + str(usbid) + ' ' + chromeswap '"' keyswapcmd = '/bin/bash -c "./keyswap_service.sh 1 0 ' + system_type + ' ' + str(internalid).strip() + ' ' + str(usbid).strip() + ' ' + str(chromeswap) + '"'
print(keyswapcmd) print(keyswapcmd)
subprocess.check_output(keyswapcmd, shell=True).decode('utf-8') subprocess.check_output(keyswapcmd, shell=True).decode('utf-8')
else: else:

4
system-config/xactive.sh
View File

@@ -38,7 +38,7 @@ echo "$systemtype $swapbehavior"
echo "$swapcmd_gui" echo "$swapcmd_gui"
# regex for extracting hex id's # regex for extracting hex id's
grep_id='0[xX][a-zA-Z0-9]\{7\}' grep_id='0[xX][a-zA-Z0-9]\+'
#Storing timestamp and will use timediff to prevent xprop duplicates #Storing timestamp and will use timediff to prevent xprop duplicates
timestp=$(date +%s) timestp=$(date +%s)
@@ -53,6 +53,7 @@ while read -r id; do
# Set keymap for terminal, Alt is Super, Ctrl is Ctrl, Super is Alt # Set keymap for terminal, Alt is Super, Ctrl is Ctrl, Super is Alt
if [[ $internalid -gt 0 ]]; then if [[ $internalid -gt 0 ]]; then
eval "$check_gt" eval "$check_gt"
echo $?
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "internal gui to term" echo "internal gui to term"
eval "$swapcmd_term" eval "$swapcmd_term"
@@ -70,6 +71,7 @@ while read -r id; do
# Set keymap for gui, Alt is Ctrl,Super is Alt, Ctrl is Super # Set keymap for gui, Alt is Ctrl,Super is Alt, Ctrl is Super
if [[ $internalid -gt 0 ]]; then if [[ $internalid -gt 0 ]]; then
eval "$check_tg" eval "$check_tg"
echo $?
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "internal term to gui" echo "internal term to gui"
eval "$swapcmd_gui" eval "$swapcmd_gui"