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

Merge pull request #495 from rbreaves/feature/mxlinux

Browse Source 
Adding support for sysvinit & mxlinux w/ xfce
This commit is contained in:
Ben Reaves
2021-05-04 18:07:43 -05:00
committed by GitHub
parent 3418e6bf3f eeb5cc9ecb
commit 23e2f7018b
6 changed files with 281 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
linux/gui/kinto-gui.py
View File

@@ -1,6 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import gi,os,time,fcntl,argparse,re import gi,os,time,fcntl,argparse,re
import warnings
warnings.filterwarnings("ignore")
gi.require_version('Gtk', '3.0') gi.require_version('Gtk', '3.0')
gi.require_version('Vte', '2.91') gi.require_version('Vte', '2.91')
from gi.repository import Gtk,Gdk,GdkPixbuf from gi.repository import Gtk,Gdk,GdkPixbuf
@@ -48,13 +50,21 @@ class MyWindow(Gtk.Window):
page = 1 page = 1
label = Gtk.Label() label = Gtk.Label()
label.set_alignment(1, 0) label.set_halign(Gtk.Align.END)
ostype = os.environ.get('XDG_CURRENT_DESKTOP') ostype = os.environ.get('XDG_CURRENT_DESKTOP')
global openWin global openWin
openWin = False openWin = False
global child_pid global child_pid
kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True) global sysv
try:
sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
except:
sysv = 2
if sysv:
kinto_status = Popen("while :; do clear; pgrep 'xkeysnail' && echo 'active'; sleep 2; done", stdout=PIPE, shell=True)
else:
kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
child_pid = kinto_status.pid child_pid = kinto_status.pid
winkb = Gtk.RadioMenuItem(label='Windows') winkb = Gtk.RadioMenuItem(label='Windows')
@@ -114,9 +124,15 @@ class MyWindow(Gtk.Window):
None, None,
) )
if self.args.debug: if self.args.debug:
self.command = 'sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n' if sysv:
self.command = 'sudo /etc/init.d/kinto stop && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
else:
self.command = 'sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
else: else:
self.command = "journalctl -f --unit=xkeysnail.service -b\n" if sysv:
self.command = "tail -f /tmp/kinto.log\n"
else:
self.command = "journalctl -f --unit=xkeysnail.service -b\n"
self.InputToTerm(self.command) self.InputToTerm(self.command)
@@ -181,19 +197,19 @@ class MyWindow(Gtk.Window):
menubar.append(menuitem_edit) menubar.append(menuitem_edit)
submenu_edit = Gtk.Menu() submenu_edit = Gtk.Menu()
menuitem_edit.set_submenu(submenu_edit) menuitem_edit.set_submenu(submenu_edit)
edititem_tweaks = Gtk.MenuItem("Tweaks") edititem_tweaks = Gtk.MenuItem(label="Tweaks")
edititem_tweaks.connect('activate',self.setTweaks) edititem_tweaks.connect('activate',self.setTweaks)
submenu_edit.append(edititem_tweaks) submenu_edit.append(edititem_tweaks)
edititem_config = Gtk.MenuItem("Kinto Config (shortcuts)") edititem_config = Gtk.MenuItem(label="Kinto Config (shortcuts)")
edititem_config.connect('activate',self.setConfig) edititem_config.connect('activate',self.setConfig)
submenu_edit.append(edititem_config) submenu_edit.append(edititem_config)
edititem_service = Gtk.MenuItem("Kinto Service") edititem_service = Gtk.MenuItem(label="Kinto Service")
edititem_service.connect('activate',self.setService) edititem_service.connect('activate',self.setService)
submenu_edit.append(edititem_service) submenu_edit.append(edititem_service)
edititem_shortcuts = Gtk.MenuItem("System Shortcuts") edititem_shortcuts = Gtk.MenuItem(label="System Shortcuts")
edititem_shortcuts.connect('activate',self.setSysKB) edititem_shortcuts.connect('activate',self.setSysKB)
submenu_edit.append(edititem_shortcuts) submenu_edit.append(edititem_shortcuts)
edititem_language = Gtk.MenuItem("Change Language") edititem_language = Gtk.MenuItem(label="Change Language")
edititem_language.connect('activate',self.setRegion) edititem_language.connect('activate',self.setRegion)
submenu_edit.append(edititem_language) submenu_edit.append(edititem_language)
@@ -207,11 +223,11 @@ class MyWindow(Gtk.Window):
helpitem_debug = Gtk.MenuItem(label="Debug") helpitem_debug = Gtk.MenuItem(label="Debug")
helpitem_debug.connect('activate',self.runDebug) helpitem_debug.connect('activate',self.runDebug)
submenu_help.append(helpitem_debug) submenu_help.append(helpitem_debug)
helpitem_support = Gtk.MenuItem("Support") helpitem_support = Gtk.MenuItem(label="Support")
helpitem_support.connect('activate',self.openSupport) helpitem_support.connect('activate',self.openSupport)
submenu_help.append(helpitem_support) submenu_help.append(helpitem_support)
menuitem_help.set_submenu(submenu_help) menuitem_help.set_submenu(submenu_help)
helpitem_about = Gtk.MenuItem("About") helpitem_about = Gtk.MenuItem(label="About")
helpitem_about.connect('activate',self.runAbout) helpitem_about.connect('activate',self.runAbout)
submenu_help.append(helpitem_about) submenu_help.append(helpitem_about)
@@ -343,7 +359,6 @@ class MyWindow(Gtk.Window):
self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,False) self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,False)
restartsvc = True restartsvc = True
def initSetup(self): def initSetup(self):
global win,openWin,restartsvc global win,openWin,restartsvc
@@ -420,21 +435,20 @@ class MyWindow(Gtk.Window):
pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxcry4.png') pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxcry4.png')
pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR) pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
self.bgsuccess4 = self.bgsuccess4.new_from_pixbuf(pixbuf) self.bgsuccess4 = self.bgsuccess4.new_from_pixbuf(pixbuf)
self.bgsuccess4.set_alignment(0, 1) self.bgsuccess4.set_valign(Gtk.Align.END)
pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxuninstall.png') pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxuninstall.png')
pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR) pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
self.bguninstall = self.bguninstall.new_from_pixbuf(pixbuf) self.bguninstall = self.bguninstall.new_from_pixbuf(pixbuf)
self.bguninstall.set_alignment(0, 1) self.bguninstall.set_valign(Gtk.Align.END)
pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxbg.png') pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxbg.png')
pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR) pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
self.background = self.background.new_from_pixbuf(pixbuf) self.background = self.background.new_from_pixbuf(pixbuf)
self.background.set_alignment(0, 1) self.background.set_valign(Gtk.Align.END)
self.bgcaps = self.bgcaps.new_from_pixbuf(pixbuf2) self.bgcaps = self.bgcaps.new_from_pixbuf(pixbuf2)
self.bgcaps.set_alignment(0, 1)
self.bgspace = self.bgspace.new_from_pixbuf(pixbuf3) self.bgspace = self.bgspace.new_from_pixbuf(pixbuf3)
self.bgspace.set_alignment(0, 1) self.bgspace.set_valign(Gtk.Align.END)
self.overlay.add(self.background) self.overlay.add(self.background)
self.overlay.add_overlay(self.container) self.overlay.add_overlay(self.container)
self.setupwin.add(self.container) self.setupwin.add(self.container)
@@ -456,7 +470,7 @@ class MyWindow(Gtk.Window):
def image2pixbuf(self,im): def image2pixbuf(self,im):
data = im.tobytes() data = im.tobytes()
w, h = im.size w, h = im.size
print(im.size) # print(im.size)
data = GLib.Bytes.new(data) data = GLib.Bytes.new(data)
pix = GdkPixbuf.Pixbuf.new_from_bytes(data, GdkPixbuf.Colorspace.RGB,True, 8, w, h, w * 4) pix = GdkPixbuf.Pixbuf.new_from_bytes(data, GdkPixbuf.Colorspace.RGB,True, 8, w, h, w * 4)
return pix return pix
@@ -517,7 +531,10 @@ class MyWindow(Gtk.Window):
return return
def runDebug(self,button): def runDebug(self,button):
command = 'send \003 sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n' if sysv:
command = 'send \003 sudo /etc/init.d/kinto stop && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
else:
command = 'send \003 sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
self.InputToTerm(command) self.InputToTerm(command)
def openSupport(self,button): def openSupport(self,button):
@@ -610,7 +627,10 @@ class MyWindow(Gtk.Window):
self.queryConfig(killspawn) self.queryConfig(killspawn)
time.sleep(1) time.sleep(1)
global child_pid global child_pid
self.kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True) if sysv:
self.kinto_status = Popen("while :; do clear; pgrep 'xkeysnail'; sleep 2; done", stdout=PIPE, shell=True)
else:
self.kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
child_pid = self.kinto_status.pid child_pid = self.kinto_status.pid
self.menuitem_systray.disconnect(self.menuitem_systray.signal_id) self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
self.menuitem_systray.set_active(False) self.menuitem_systray.set_active(False)
@@ -618,6 +638,7 @@ class MyWindow(Gtk.Window):
return return
def setKB(self,button,kbtype): def setKB(self,button,kbtype):
global sysv
try: try:
if kbtype == "win": if kbtype == "win":
setkb = 's/^(\s{3})(\s{1}#)(.*# WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)( Default Win)|^(\s{3})(\s{1}# )(-)(- Default Mac*)/ $3$7$6$7$8$12$11$12$13$17$16$17$18$20$21$21$22$24$26/g' setkb = 's/^(\s{3})(\s{1}#)(.*# WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)( Default Win)|^(\s{3})(\s{1}# )(-)(- Default Mac*)/ $3$7$6$7$8$12$11$12$13$17$16$17$18$20$21$21$22$24$26/g'
@@ -654,7 +675,10 @@ class MyWindow(Gtk.Window):
elif kbtype == "ibm": elif kbtype == "ibm":
setkb ='s/^(\s{3})(\s{1}#)(.*# IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)(- Default (Win|Mac.*))/ $3$7$6$7$8$12$11$12$13$17$16$17$18$20$22/g' setkb ='s/^(\s{3})(\s{1}#)(.*# IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)(- Default (Win|Mac.*))/ $3$7$6$7$8$12$11$12$13$17$16$17$18$20$22/g'
restart = ['sudo', 'systemctl','restart','xkeysnail'] if sysv:
restart = ['sudo', '-E','/etc/init.d/kinto','restart']
else:
restart = ['sudo', 'systemctl','restart','xkeysnail']
cmds = ['perl','-pi','-e',setkb,self.kconfig] cmds = ['perl','-pi','-e',setkb,self.kconfig]
cmdsTerm = Popen(cmds) cmdsTerm = Popen(cmds)
@@ -746,11 +770,14 @@ class MyWindow(Gtk.Window):
} }
def on_delete_event(event, self, widget): def on_delete_event(event, self, widget):
global restartsvc, openWin global restartsvc, openWin, sysv
if restartsvc == True: if restartsvc == True:
try: try:
restartcmd = ['sudo', 'systemctl','restart','xkeysnail'] if sysv:
restartcmd = ['sudo', '-E','/etc/init.d/kinto','restart']
else:
restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
Popen(restartcmd) Popen(restartcmd)
restartsvc = False restartsvc = False
@@ -870,8 +897,12 @@ class MyWindow(Gtk.Window):
return return
def runRestart(self,button): def runRestart(self,button):
global sysv
try: try:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail']) if sysv:
stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
else:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
stop.wait() stop.wait()
time.sleep(1) time.sleep(1)
res = Popen(['pgrep','xkeysnail']) res = Popen(['pgrep','xkeysnail'])
@@ -880,15 +911,23 @@ class MyWindow(Gtk.Window):
if res.returncode == 0: if res.returncode == 0:
pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
pkillxkey.wait() pkillxkey.wait()
Popen(['sudo', 'systemctl','start','xkeysnail']) if sysv:
self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n" Popen(['sudo','-E','/etc/init.d/kinto','start'])
self.command = "send \003 tail -f /tmp/kinto.log\n"
else:
Popen(['sudo','systemctl','start','xkeysnail'])
self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n"
self.InputToTerm(self.command) self.InputToTerm(self.command)
except: except:
Popen(['notify-send','Kinto: Errror restarting Kinto!']) Popen(['notify-send','Kinto: Errror restarting Kinto!'])
def runStop(self,button): def runStop(self,button):
global sysv
try: try:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail']) if sysv:
stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
else:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
stop.wait() stop.wait()
time.sleep(1) time.sleep(1)
res = Popen(['pgrep','xkeysnail']) res = Popen(['pgrep','xkeysnail'])
@@ -1077,7 +1116,7 @@ class MyWindow(Gtk.Window):
except: except:
pass pass
print(Vte.get_minor_version()) # print(Vte.get_minor_version())
# def on_menu_auto(self, widget): # def on_menu_auto(self, widget):
# print("add file open dialog") # print("add file open dialog")
@@ -1106,34 +1145,36 @@ class UninstallPage(Gtk.Box):
label_start = Gtk.Label() label_start = Gtk.Label()
label_start.set_markup('<b>Uninstall</b>\n\n\n\nWould you like to uninstall kinto?\n\n If you need support please visit <a href="http://kinto.sh">kinto.sh</a>.') label_start.set_markup('<b>Uninstall</b>\n\n\n\nWould you like to uninstall kinto?\n\n If you need support please visit <a href="http://kinto.sh">kinto.sh</a>.')
label_start.set_alignment(0,0) label_start.set_valign(Gtk.Align.START)
label_start.set_halign(Gtk.Align.START)
label_start.set_line_wrap(True) label_start.set_line_wrap(True)
vbox.add(label_start) vbox.add(label_start)
scroller.add(vbox) scroller.add(vbox)
hbox = Gtk.HBox() hbox = Gtk.HBox()
previous = Gtk.Button("Uninstall") previous = Gtk.Button(label="Uninstall")
previous.connect("clicked", self.goback) previous.connect("clicked", self.goback)
previous.set_margin_right(206) previous.set_margin_end(206)
hbox.add(previous) hbox.add(previous)
onward = Gtk.Button("Continue") onward = Gtk.Button(label="Continue")
onward.connect("clicked", self.forward) onward.connect("clicked", self.forward)
hbox.add(onward) hbox.add(onward)
hbox.set_hexpand(False) hbox.set_hexpand(False)
hbox.set_vexpand(False) hbox.set_vexpand(False)
hbox.set_margin_bottom(6) hbox.set_margin_bottom(6)
hbox.set_margin_right(25) hbox.set_margin_end(25)
scroller.set_hexpand(True) scroller.set_hexpand(True)
scroller.set_vexpand(True) scroller.set_vexpand(True)
vbox_container.add(scroller) vbox_container.add(scroller)
vbox_container.set_margin_top(55) vbox_container.set_margin_top(55)
vbox_container.set_margin_right(25) vbox_container.set_margin_end(25)
self.grid.set_margin_left(157) self.grid.set_margin_start(157)
vbox_container.set_margin_bottom(18) vbox_container.set_margin_bottom(18)
vbox.set_margin_right(10) vbox.set_margin_end(10)
vbox.set_margin_bottom(18) vbox.set_margin_bottom(18)
self.grid.add(vbox_container) self.grid.add(vbox_container)
self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1) self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1165,18 +1206,19 @@ class FirstPage(Gtk.Box):
label_start = Gtk.Label() label_start = Gtk.Label()
label_start.set_markup("Before we continue please make sure you do not have any other remappers running. Kinto works best when it is the only application remapping your keys.\n\nBy continuing you also agree that Kinto is not held liable for any harm, damage(s) or unexpected behaviors.\nThis software is free, open-source, and provided as-is.\n\n<sup><b>© 2019, 2020 by Ben Reaves ~ Kinto is licensed on GPLv2.</b></sup>") label_start.set_markup("Before we continue please make sure you do not have any other remappers running. Kinto works best when it is the only application remapping your keys.\n\nBy continuing you also agree that Kinto is not held liable for any harm, damage(s) or unexpected behaviors.\nThis software is free, open-source, and provided as-is.\n\n<sup><b>© 2019, 2020 by Ben Reaves ~ Kinto is licensed on GPLv2.</b></sup>")
label_start.set_alignment(0,0) label_start.set_valign(Gtk.Align.START)
label_start.set_halign(Gtk.Align.START)
label_start.set_line_wrap(True) label_start.set_line_wrap(True)
vbox.add(label_start) vbox.add(label_start)
scroller.add(vbox) scroller.add(vbox)
hbox = Gtk.HBox() hbox = Gtk.HBox()
previous = Gtk.Button("") previous = Gtk.Button(label="")
for child in previous.get_children(): for child in previous.get_children():
child.set_label("<b>Decline</b>") child.set_label("<b>Decline</b>")
child.set_use_markup(True) child.set_use_markup(True)
previous.connect("clicked", self.goback) previous.connect("clicked", self.goback)
previous.set_margin_right(245) previous.set_margin_end(245)
hbox.add(previous) hbox.add(previous)
self.__parent_window.first_onward.set_label("") self.__parent_window.first_onward.set_label("")
@@ -1190,16 +1232,16 @@ class FirstPage(Gtk.Box):
hbox.set_hexpand(False) hbox.set_hexpand(False)
hbox.set_vexpand(False) hbox.set_vexpand(False)
hbox.set_margin_bottom(6) hbox.set_margin_bottom(6)
hbox.set_margin_right(25) hbox.set_margin_end(25)
scroller.set_hexpand(True) scroller.set_hexpand(True)
scroller.set_vexpand(True) scroller.set_vexpand(True)
vbox_container.add(scroller) vbox_container.add(scroller)
vbox_container.set_margin_top(55) vbox_container.set_margin_top(55)
vbox_container.set_margin_right(28) vbox_container.set_margin_end(28)
self.grid.set_margin_left(157) self.grid.set_margin_start(157)
vbox_container.set_margin_bottom(18) vbox_container.set_margin_bottom(18)
vbox.set_margin_right(10) vbox.set_margin_end(10)
vbox.set_margin_bottom(18) vbox.set_margin_bottom(18)
self.grid.add(vbox_container) self.grid.add(vbox_container)
self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1) self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1238,37 +1280,38 @@ class SecondPage(Gtk.Box):
label_start = Gtk.Label() label_start = Gtk.Label()
label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>2nd</b> key <b>Left</b> of the spacebar.\n\n<sub>If stuck here then unset Overlay (Super) key on your DE.</sub>') label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>2nd</b> key <b>Left</b> of the spacebar.\n\n<sub>If stuck here then unset Overlay (Super) key on your DE.</sub>')
label_start.set_alignment(0,0) label_start.set_valign(Gtk.Align.START)
label_start.set_halign(Gtk.Align.START)
label_start.set_line_wrap(True) label_start.set_line_wrap(True)
vbox.add(label_start) vbox.add(label_start)
scroller.add(vbox) scroller.add(vbox)
hbox = Gtk.HBox() hbox = Gtk.HBox()
previous = Gtk.Button("") previous = Gtk.Button(label="")
for child in previous.get_children(): for child in previous.get_children():
child.set_label("<b>Go Back</b>") child.set_label("<b>Go Back</b>")
child.set_use_markup(True) child.set_use_markup(True)
previous.connect("clicked", self.goback) previous.connect("clicked", self.goback)
previous.set_margin_right(315) previous.set_margin_end(315)
hbox.add(previous) hbox.add(previous)
# onward = Gtk.Button("Continue") # onward = Gtk.Button(label="Continue")
# onward.connect("clicked", self.forward) # onward.connect("clicked", self.forward)
# hbox.add(onward) # hbox.add(onward)
hbox.set_hexpand(False) hbox.set_hexpand(False)
hbox.set_vexpand(False) hbox.set_vexpand(False)
hbox.set_margin_bottom(6) hbox.set_margin_bottom(6)
hbox.set_margin_right(25) hbox.set_margin_end(25)
scroller.set_hexpand(True) scroller.set_hexpand(True)
scroller.set_vexpand(True) scroller.set_vexpand(True)
vbox_container.add(scroller) vbox_container.add(scroller)
vbox_container.set_margin_top(55) vbox_container.set_margin_top(55)
vbox_container.set_margin_right(25) vbox_container.set_margin_end(25)
self.grid.set_margin_left(157) self.grid.set_margin_start(157)
vbox_container.set_margin_bottom(18) vbox_container.set_margin_bottom(18)
vbox.set_margin_right(10) vbox.set_margin_end(10)
vbox.set_margin_bottom(18) vbox.set_margin_bottom(18)
self.grid.add(vbox_container) self.grid.add(vbox_container)
self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1) self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1322,37 +1365,38 @@ class CapsPage(Gtk.Box):
label_start = Gtk.Label() label_start = Gtk.Label()
label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>capslock</b> key twice.') label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>capslock</b> key twice.')
label_start.set_alignment(0,0) label_start.set_valign(Gtk.Align.START)
label_start.set_halign(Gtk.Align.START)
label_start.set_line_wrap(True) label_start.set_line_wrap(True)
vbox.add(label_start) vbox.add(label_start)
scroller.add(vbox) scroller.add(vbox)
hbox = Gtk.HBox() hbox = Gtk.HBox()
previous = Gtk.Button("") previous = Gtk.Button(label="")
for child in previous.get_children(): for child in previous.get_children():
child.set_label("<b>Go Back</b>") child.set_label("<b>Go Back</b>")
child.set_use_markup(True) child.set_use_markup(True)
previous.connect("clicked", self.goback) previous.connect("clicked", self.goback)
previous.set_margin_right(315) previous.set_margin_end(315)
hbox.add(previous) hbox.add(previous)
# onward = Gtk.Button("Continue") # onward = Gtk.Button(label="Continue")
# onward.connect("clicked", self.forward) # onward.connect("clicked", self.forward)
# hbox.add(onward) # hbox.add(onward)
hbox.set_hexpand(False) hbox.set_hexpand(False)
hbox.set_vexpand(False) hbox.set_vexpand(False)
hbox.set_margin_bottom(6) hbox.set_margin_bottom(6)
hbox.set_margin_right(25) hbox.set_margin_end(25)
scroller.set_hexpand(True) scroller.set_hexpand(True)
scroller.set_vexpand(True) scroller.set_vexpand(True)
vbox_container.add(scroller) vbox_container.add(scroller)
vbox_container.set_margin_top(55) vbox_container.set_margin_top(55)
vbox_container.set_margin_right(25) vbox_container.set_margin_end(25)
self.grid.set_margin_left(157) self.grid.set_margin_start(157)
vbox_container.set_margin_bottom(18) vbox_container.set_margin_bottom(18)
vbox.set_margin_right(10) vbox.set_margin_end(10)
vbox.set_margin_bottom(18) vbox.set_margin_bottom(18)
self.grid.add(vbox_container) self.grid.add(vbox_container)
self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1) self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1389,9 +1433,9 @@ class SuccessPage(Gtk.Box):
self.grid = Gtk.Grid() self.grid = Gtk.Grid()
hbox = Gtk.HBox() hbox = Gtk.HBox()
previous = Gtk.Button(" ") previous = Gtk.Button(label=" ")
previous.props.relief = Gtk.ReliefStyle.NONE previous.props.relief = Gtk.ReliefStyle.NONE
previous.set_margin_right(245) previous.set_margin_end(245)
hbox.add(previous) hbox.add(previous)
self.__parent_window.last_onward.set_label("") self.__parent_window.last_onward.set_label("")
@@ -1404,7 +1448,7 @@ class SuccessPage(Gtk.Box):
hbox.set_hexpand(False) hbox.set_hexpand(False)
hbox.set_vexpand(False) hbox.set_vexpand(False)
hbox.set_margin_bottom(6) hbox.set_margin_bottom(6)
hbox.set_margin_right(25) hbox.set_margin_end(25)
scroller = Gtk.ScrolledWindow() scroller = Gtk.ScrolledWindow()
scroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) scroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER)
@@ -1413,11 +1457,11 @@ class SuccessPage(Gtk.Box):
vbox = Gtk.VBox() vbox = Gtk.VBox()
vbox_container = Gtk.VBox() vbox_container = Gtk.VBox()
vbox_container.set_margin_top(55) vbox_container.set_margin_top(55)
vbox_container.set_margin_right(28) vbox_container.set_margin_end(28)
vbox_container.add(scroller) vbox_container.add(scroller)
self.grid.set_margin_left(157) self.grid.set_margin_start(157)
vbox_container.set_margin_bottom(18) vbox_container.set_margin_bottom(18)
vbox.set_margin_right(10) vbox.set_margin_end(10)
vbox.set_margin_bottom(18) vbox.set_margin_bottom(18)
self.grid.add(vbox_container) self.grid.add(vbox_container)
self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1) self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)

57
linux/kinto-service.sh Executable file
View File

@@ -0,0 +1,57 @@
#!/bin/bash
#
# chkconfig: 35 90 12
# description: Kinto service
#
# Get function from functions library
# . /etc/init.d/functions
# Start the service
start() {
echo -n "Starting Kinto (xkeynsail)" | logger
xkeycount=$(pgrep 'xkeysnail' | wc -l)
if [[ $xkeycount -eq 0 ]]; then
/usr/bin/xhost +SI:localuser:root && script -q -c "xkeysnail --quiet --watch `echo $HOME`/.config/kinto/kinto.py" /dev/null | tee -a /tmp/kinto.log &
### Create the lock file ###
touch /var/lock/subsys/kinto
success $"Kinto (xkeynsail) started"
else
echo "Kinto (xkeynsail) service is already running."
fi
echo
}
# Restart the service
stop() {
echo -n "Stopping Kinto (xkeynsail)" | logger
pgrep 'xkeysnail' | xargs -r -n1 sudo kill
### Now, delete the lock file ###
rm -f /var/lock/subsys/kinto
echo
}
### main logic ###
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status
;;
restart|reload|condrestart)
stop
sleep 2
start
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|status}"
exit 1
esac
exit 0

5
linux/limitedadmins
View File

@@ -1,4 +1,7 @@
# /etc/sudoers.d/limitedadmins # /etc/sudoers.d/limitedadmins
Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11/bin"
Defaults!/etc/init.d/kinto setenv,env_reset,env_delete+=PATH,env_delete+=LD_PRELOAD,env_delete+=LD_LIBRARY_PATH,env_delete+=SSH_AUTH_SOCK,env_delete+=PYTHONPATH,env_delete+=PERL5LIB
%{username} ALL=NOPASSWD: /etc/init.d/kinto *
%{username} ALL=NOPASSWD: {systemctl} restart xkeysnail %{username} ALL=NOPASSWD: {systemctl} restart xkeysnail
%{username} ALL=NOPASSWD: {systemctl} start xkeysnail %{username} ALL=NOPASSWD: {systemctl} start xkeysnail
%{username} ALL=NOPASSWD: {systemctl} stop xkeysnail %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail
@@ -6,5 +9,5 @@
%{username} ALL=(root) NOPASSWD: /usr/local/bin/logoff.sh %{username} ALL=(root) NOPASSWD: /usr/local/bin/logoff.sh
%{username} ALL=NOPASSWD: {pkill} -f logoff %{username} ALL=NOPASSWD: {pkill} -f logoff
%{username} ALL=NOPASSWD: {pkill} -f bin/xkeysnail %{username} ALL=NOPASSWD: {pkill} -f bin/xkeysnail
%{username} ALL=NOPASSWD: {xkeysnail} /home/{username}/.config/kinto/kinto.py %{username} ALL=NOPASSWD: {xkeysnail} *
%{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail %{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail

48
linux/trayapps/appindicator/kintotray.py
View File

@@ -7,7 +7,7 @@ gi.require_version('AppIndicator3', '0.1')
gi.require_version('Notify', '0.7') gi.require_version('Notify', '0.7')
import signal,time,os,fcntl,datetime,re import signal,time,os,fcntl,datetime,re
from subprocess import Popen, PIPE, CalledProcessError from subprocess import Popen, PIPE, CalledProcessError, check_output
from shutil import which from shutil import which
from gi.repository import Gtk,GLib,GdkPixbuf from gi.repository import Gtk,GLib,GdkPixbuf
from gi.repository import AppIndicator3 as appindicator from gi.repository import AppIndicator3 as appindicator
@@ -29,7 +29,15 @@ APPINDICATOR_ID = 'Kinto'
class Indicator(): class Indicator():
global child_pid global child_pid
kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2s; done", stdout=PIPE, shell=True) global sysv
try:
sysv = check_output("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'").strip().decode('UTF-8')
except:
sysv = 1
if sysv:
kinto_status = Popen("while :; do clear; pgrep 'xkeysnail' && echo 'active'; sleep 2; done", stdout=PIPE, shell=True)
else:
kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
child_pid = kinto_status.pid child_pid = kinto_status.pid
homedir = os.path.expanduser("~") homedir = os.path.expanduser("~")
@@ -79,7 +87,15 @@ class Indicator():
last_status = "" last_status = ""
def __init__(self): def __init__(self):
res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail']) global sysv
try:
sysv = check_output("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'").strip().decode('UTF-8')
except:
sysv = 1
if sysv:
res = Popen(['pgrep','xkeysnail'])
else:
res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail'])
res.wait() res.wait()
if res.returncode == 0: if res.returncode == 0:
@@ -446,7 +462,10 @@ class Indicator():
global restartsvc global restartsvc
if restartsvc == True: if restartsvc == True:
try: try:
restartcmd = ['sudo', 'systemctl','restart','xkeysnail'] if sysv:
restartcmd = ['sudo', '-E','/etc/init.d/kinto','restart']
else:
restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
Popen(restartcmd) Popen(restartcmd)
restartsvc = False restartsvc = False
@@ -555,8 +574,12 @@ class Indicator():
return return
def runRestart(self,button): def runRestart(self,button):
global sysv
try: try:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail']) if sysv:
stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
else:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
stop.wait() stop.wait()
time.sleep(1) time.sleep(1)
res = Popen(['pgrep','xkeysnail']) res = Popen(['pgrep','xkeysnail'])
@@ -567,13 +590,19 @@ class Indicator():
pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
pkillxkey.wait() pkillxkey.wait()
Popen(['sudo', 'systemctl','start','xkeysnail']) if sysv:
Popen(['sudo', '-E','/etc/init.d/kinto','start'])
else:
Popen(['sudo', 'systemctl','start','xkeysnail'])
except: except:
Popen(['notify-send','Kinto: Error restarting Kinto!']) Popen(['notify-send','Kinto: Error restarting Kinto!'])
def runStop(self,button): def runStop(self,button):
try: try:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail']) if sysv:
stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
else:
stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
stop.wait() stop.wait()
time.sleep(1) time.sleep(1)
res = Popen(['pgrep','xkeysnail']) res = Popen(['pgrep','xkeysnail'])
@@ -689,7 +718,10 @@ class Indicator():
cmdsTerm = Popen(cmds) cmdsTerm = Popen(cmds)
cmdsTerm.wait() cmdsTerm.wait()
restart = ['sudo', 'systemctl','restart','xkeysnail'] if sysv:
restart = ['sudo', '-E','/etc/init.d/kinto','restart']
else:
restart = ['sudo', 'systemctl','restart','xkeysnail']
Popen(restart) Popen(restart)
except CalledProcessError: except CalledProcessError:

8
linux/xkeysnail_sysv.desktop Executable file
View File

@@ -0,0 +1,8 @@
[Desktop Entry]
Name=Kinto_xkey
GenericName=Kinto_xkey
Comment=Make Linux Type Like it's a Mac
Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && sudo -E /etc/init.d/kinto restart"
Terminal=false
Type=Application
X-GNOME-Autostart-enabled=true

92
xkeysnail_service.sh
View File

@@ -3,11 +3,18 @@
# set about:config?filter=ui.key.menuAccessKeyFocuses # set about:config?filter=ui.key.menuAccessKeyFocuses
# to false for wordwise to work in Firefox # to false for wordwise to work in Firefox
function pause(){
read -s -n 1 -p "Press any key to continue . . ."
echo ""
}
typeset -l distro typeset -l distro
distro=$(awk -F= '$1=="NAME" { gsub("[\",!,_, ]","",$2);print $2 ;}' /etc/os-release) distro=$(awk -F= '$1=="NAME" { gsub("[\",!,_, ]","",$2);print $2 ;}' /etc/os-release)
typeset -l dename typeset -l dename
dename=$(./linux/system-config/dename.sh | cut -d " " -f1) dename=$(./linux/system-config/dename.sh | cut -d " " -f1)
sysv=$(pidof systemd >/dev/null 2>&1 && echo "1" || echo "0")
function uninstall { function uninstall {
echo -e "\nNote: Restoring keys is only relevant if you had installed a version prior to 1.2 of Kinto. You should skip this step if 1.2+ is all you have installed." echo -e "\nNote: Restoring keys is only relevant if you had installed a version prior to 1.2 of Kinto. You should skip this step if 1.2+ is all you have installed."
@@ -352,12 +359,12 @@ if ! [ -x "$(command -v pip3)" ]; then
sudo ./linux/system-config/unipkg.sh python3-pip sudo ./linux/system-config/unipkg.sh python3-pip
fi fi
if ! [ -x "$(command -v python3-config)" ]; then if ! [ -x "$(command -v python3-config)" ]; then
if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then if [ "$distro" == "ubuntu" ] || [ "${distro::6}" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
pydev="python3-dev" pydev="python3-dev"
elif [ "$distro" == "fedora" ]; then elif [ "$distro" == "fedora" ]; then
pydev="python3-devel" pydev="python3-devel"
fi fi
if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "${distro::6}" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
echo "Will need to install $pydev..." echo "Will need to install $pydev..."
sudo ./linux/system-config/unipkg.sh "$pydev" sudo ./linux/system-config/unipkg.sh "$pydev"
fi fi
@@ -370,8 +377,10 @@ if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
sudo ./linux/system-config/unipkg.sh "xorg-xhost gcc" sudo ./linux/system-config/unipkg.sh "xorg-xhost gcc"
fi fi
fi fi
if [ "$distro" == 'linuxmint' ]; then if [ "$distro" == 'linuxmint' ] ; then
pip3 install setuptools pip3 install setuptools
elif [ "${distro::6}" == "debian" ]; then
sudo pip3 install setuptools wheel
fi fi
pip3 install pillow pip3 install pillow
@@ -386,7 +395,11 @@ mkdir -p ~/.config/kinto
# KDE startup - xhost fix # KDE startup - xhost fix
mkdir -p ~/.config/autostart mkdir -p ~/.config/autostart
yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop if [ ! "$sysv" -eq 0 ];then
yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
else
yes | cp -rf ./linux/xkeysnail_sysv.desktop ~/.config/kinto/xkeysnail.desktop
fi
# yes | cp -rf ./linux/xkeystart.sh ~/.config/kinto/xkeystart.sh # yes | cp -rf ./linux/xkeystart.sh ~/.config/kinto/xkeystart.sh
@@ -411,7 +424,6 @@ else
fi fi
yes | cp -rf ./linux/kinto.py ./linux/kinto.py.new yes | cp -rf ./linux/kinto.py ./linux/kinto.py.new
yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new
yes | cp -rf ./linux/gui/ ~/.config/kinto/ yes | cp -rf ./linux/gui/ ~/.config/kinto/
yes | cp -nrf ./linux/initkb ~/.config/kinto/initkb yes | cp -nrf ./linux/initkb ~/.config/kinto/initkb
yes | cp -rf ./linux/killdups.sh ~/.config/kinto/killdups.sh yes | cp -rf ./linux/killdups.sh ~/.config/kinto/killdups.sh
@@ -424,29 +436,36 @@ yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-invert-16.svg ~/.config/k
yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg
yes | cp -rf ./linux/trayapps/appindicator/icons/kinto.svg ~/.config/kinto/kinto.svg yes | cp -rf ./linux/trayapps/appindicator/icons/kinto.svg ~/.config/kinto/kinto.svg
# yes | cp -rf ./linux/system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh # yes | cp -rf ./linux/system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh
yes | cp -rf ./linux/xkeysnail.service ./linux/xkeysnail.service.new
# yes | cp -rf ./linux/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new
sed -i "s#{experimental-caret}#$exp#g" ./linux/xkeysnail.service.new sed -i "s/{username}/`whoami`/g" ./linux/limitedadmins.new
if [ "$expsh" != " " ];then sed -i "s#{systemctl}#`\\which systemctl`#g" ./linux/limitedadmins.new
sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./linux/xkeysnail.service.new sed -i "s#{pkill}#`\\which pkill`#g" ./linux/limitedadmins.new
if [ ! "$sysv" -eq 0 ];then
echo "Using systemd..."
yes | cp -rf ./linux/xkeysnail.service ./linux/xkeysnail.service.new
# yes | cp -rf ./linux/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
sed -i "s#{experimental-caret}#$exp#g" ./linux/xkeysnail.service.new
if [ "$expsh" != " " ];then
sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./linux/xkeysnail.service.new
else
sed -i "s#{kill-caret}#$expsh#g" ./linux/xkeysnail.service.new
fi
sed -i "s/{username}/`whoami`/g" ./linux/xkeysnail.service.new
sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/xkeysnail.service.new
sed -i "s#{xhost}#`\\which xhost`#g" ./linux/xkeysnail.service.new
sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./linux/xkeysnail.service.new
else else
sed -i "s#{kill-caret}#$expsh#g" ./linux/xkeysnail.service.new echo "Using sysvinit..."
fi fi
sed -i "s/{username}/`whoami`/g" ./linux/xkeysnail.service.new
sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/xkeysnail.service.new
sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/kintotray.desktop sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/kintotray.desktop
sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/gui/kinto-gui.py sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/gui/kinto-gui.py
sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/gui/kinto.desktop.new sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/gui/kinto.desktop.new
sudo mv ./linux/gui/kinto.desktop.new /usr/share/applications/kinto.desktop sudo mv ./linux/gui/kinto.desktop.new /usr/share/applications/kinto.desktop
sed -i "s#{xhost}#`\\which xhost`#g" ./linux/xkeysnail.service.new
sed -i "s/{username}/`whoami`/g" ./linux/limitedadmins.new
sed -i "s#{systemctl}#`\\which systemctl`#g" ./linux/limitedadmins.new
sed -i "s#{pkill}#`\\which pkill`#g" ./linux/limitedadmins.new
sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/kinto/xkeysnail.desktop sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/kinto/xkeysnail.desktop
sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/kinto/xkeysnail.desktop sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/kinto/xkeysnail.desktop
sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/xkeysnail.desktop sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/xkeysnail.desktop
# sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh # sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh
sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./linux/xkeysnail.service.new
# sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh # sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh
if [[ $dename == "budgie" ]]; then if [[ $dename == "budgie" ]]; then
@@ -493,7 +512,13 @@ fi
if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
mv ./linux/kinto.py.new ~/.config/kinto/kinto.py mv ./linux/kinto.py.new ~/.config/kinto/kinto.py
# if [ "$distro" == "fedora" ];then # if [ "$distro" == "fedora" ];then
sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1 if [ ! "$sysv" -eq 0 ];then
# echo "Using systemd..."
sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
else
# echo "Using sysvinit..."
echo ""
fi
if [ -d /usr/lib/systemd/system ];then if [ -d /usr/lib/systemd/system ];then
xkeypath="/usr/lib/systemd/system/" xkeypath="/usr/lib/systemd/system/"
elif [ -d /lib/systemd/system ];then elif [ -d /lib/systemd/system ];then
@@ -521,19 +546,27 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
echo -e "Run 'sudo pip3 install --upgrade .' to debug issue" echo -e "Run 'sudo pip3 install --upgrade .' to debug issue"
exit 0 exit 0
fi fi
sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/limitedadmins.new sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/limitedadmins.new
sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
sudo chown root:root ./linux/limitedadmins.new sudo chown root:root ./linux/limitedadmins.new
# Add a check here for xkeysnail path resolving # Add a check here for xkeysnail path resolving
sudo mv ./linux/limitedadmins.new /etc/sudoers.d/limitedadmins sudo mv ./linux/limitedadmins.new /etc/sudoers.d/limitedadmins
sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..." if [ ! "$sysv" -eq 0 ];then
sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..." # echo "Using systemd..."
sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..." sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Created soft symlink for graphical target..." || echo "Failed to create soft symlink for graphical target..." sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
sudo systemctl daemon-reload
sudo systemctl disable xkeysnail sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
sudo systemctl stop xkeysnail sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."
sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Created soft symlink for graphical target..." || echo "Failed to create soft symlink for graphical target..."
sudo systemctl daemon-reload
sudo systemctl disable xkeysnail
sudo systemctl stop xkeysnail
else
# echo "Using sysvinit..."
echo ""
sudo -E /etc/init.d/kinto stop &
fi
# sudo systemctl --state=not-found --all | grep xkeysnail # sudo systemctl --state=not-found --all | grep xkeysnail
# if [ "$distro" == "fedora" ];then # if [ "$distro" == "fedora" ];then
# systemctl enable xkeysnail.service # systemctl enable xkeysnail.service
@@ -541,7 +574,8 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
# sudo systemctl enable xkeysnail.service # sudo systemctl enable xkeysnail.service
# fi # fi
# sudo systemctl restart xkeysnail # sudo systemctl restart xkeysnail
sudo pkill -f kintotray >/dev/null 2>&1 sudo pkill -f kintotray &
# >/dev/null 2>&1
if [[ $dename == "gnome" || $dename == "kde" ]];then if [[ $dename == "gnome" || $dename == "kde" ]];then
sed -i "s/systray = true/systray = false/g" ~/.config/kinto/initkb sed -i "s/systray = true/systray = false/g" ~/.config/kinto/initkb
fi fi