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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Ben Reaves
2022-01-31 13:16:16 -06:00
parent 6b3ea9afab 94b018aa48
commit f9aaae3038
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,7 +353,7 @@ class MyWindow(Gtk.Window):
self.queryConfig('cp '+os.environ['HOME']+'/.config/kinto/xkeysnail.desktop '+os.environ['HOME']+'/.config/autostart/xkeysnail.desktop') self.queryConfig('cp '+os.environ['HOME']+'/.config/kinto/xkeysnail.desktop '+os.environ['HOME']+'/.config/autostart/xkeysnail.desktop')
if self.options["systray"]: if self.options["systray"]:
self.queryConfig('cp '+os.environ['HOME']+'/.config/kinto/kintotray.desktop '+os.environ['HOME']+'/.config/autostart/kintotray.desktop') self.queryConfig('cp '+os.environ['HOME']+'/.config/kinto/kintotray.desktop '+os.environ['HOME']+'/.config/autostart/kintotray.desktop')
self.queryConfig("nohup python3 ~/.config/kinto/kintotray.py >/dev/null 2>&1 &") self.queryConfig("nohup /usr/bin/python3 ~/.config/kinto/kintotray.py >/dev/null 2>&1 &")
self.menuitem_systray.disconnect(self.menuitem_systray.signal_id) self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
self.menuitem_systray.set_active(True) self.menuitem_systray.set_active(True)
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)
@@ -616,7 +616,7 @@ class MyWindow(Gtk.Window):
if tray_bool: if tray_bool:
Popen(['cp',os.environ['HOME']+'/.config/kinto/kintotray.desktop',os.environ['HOME']+'/.config/autostart/kintotray.desktop']) Popen(['cp',os.environ['HOME']+'/.config/kinto/kintotray.desktop',os.environ['HOME']+'/.config/autostart/kintotray.desktop'])
if not kintotray: if not kintotray:
Popen([os.environ['HOME']+'/.config/kinto/kintotray.py']) Popen(['/usr/bin/python3',os.environ['HOME']+'/.config/kinto/kintotray.py'])
self.menuitem_systray.disconnect(self.menuitem_systray.signal_id) self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
self.menuitem_systray.set_active(True) self.menuitem_systray.set_active(True)
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)

2
linux/gui/kinto.desktop
View File

@@ -4,7 +4,7 @@ Name=Kinto.sh
GenericName=Kinto.sh GenericName=Kinto.sh
Categories=Utility; Categories=Utility;
Type=Application Type=Application
Exec={homedir}/.config/kinto/gui/kinto-gui.py Exec=/usr/bin/python3 {homedir}/.config/kinto/gui/kinto-gui.py
Icon={homedir}/.config/kinto/kinto-color-48.svg Icon={homedir}/.config/kinto/kinto-color-48.svg
# Icon=/usr/share/icons/Pocillo/kinto-color.svg # Icon=/usr/share/icons/Pocillo/kinto-color.svg
Terminal=false Terminal=false

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

@@ -116,6 +116,8 @@ class Indicator():
with open(self.kconfig) as configfile: with open(self.kconfig) as configfile:
autostart_line = configfile.read().split('\n')[1] autostart_line = configfile.read().split('\n')[1]
autostart_bool = False
# Autostart # Autostart
if "autostart = true" in autostart_line.casefold(): if "autostart = true" in autostart_line.casefold():
autostart_bool = True autostart_bool = True
@@ -619,9 +621,9 @@ class Indicator():
def runDebug(self,button,opendebug): def runDebug(self,button,opendebug):
try: try:
if opendebug: if opendebug:
Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py','-d']) Popen(['/usr/bin/python3',os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py','-d'])
else: else:
Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py']) Popen(['/usr/bin/python3',os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py'])
except: except:
Popen(['notify-send','Kinto: Error opening Kinto!']) Popen(['notify-send','Kinto: Error opening Kinto!'])

6
xkeysnail_service.sh
View File

@@ -554,17 +554,15 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
xkeypath="/lib/systemd/system/" xkeypath="/lib/systemd/system/"
fi fi
xhost +SI:localuser:root xhost +SI:localuser:root
git clone --depth 10 https://github.com/rbreaves/xkeysnail.git git clone -b kinto --depth 10 https://github.com/rbreaves/xkeysnail.git
cd xkeysnail cd xkeysnail
git checkout kinto
giturl=$(git ls-remote --get-url) giturl=$(git ls-remote --get-url)
if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
echo -e "\nreplacing xkeysnail with fork...\n" echo -e "\nreplacing xkeysnail with fork...\n"
cd .. cd ..
rm -rf ./xkeysnail rm -rf ./xkeysnail
git clone --depth 10 https://github.com/rbreaves/xkeysnail.git git clone -b kinto --depth 10 https://github.com/rbreaves/xkeysnail.git
cd xkeysnail cd xkeysnail
git checkout kinto
fi fi
sudo pip3 install --upgrade . sudo pip3 install --upgrade .
cd .. cd ..