merge 'staging'

This commit is contained in:
Vinicius Moreira
2019-08-12 17:29:33 -03:00
parent 7af8e89325
commit 1951a545c8
48 changed files with 119 additions and 119 deletions

View File

@@ -5,18 +5,18 @@ import sys
desktop_file = """
[Desktop Entry]
Type = Application
Name = fpakman
Name = bauh
Categories = System;
Comment = Manage your Flatpak / Snap applications
Comment = Manage your Snap applications
Exec = {path}
Icon = {lib_path}/python{version}/site-packages/fpakman/resources/img/logo.svg
Icon = {lib_path}/python{version}/site-packages/bauh/resources/img/logo.svg
"""
py_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
fpakman_cmd = os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman')
app_cmd = os.getenv('BAUH_PATH', '/usr/bin/bauh')
with open('fpakman.desktop', 'w+') as f:
f.write(desktop_file.format(lib_path=os.getenv('FPAKMAN_LIB_PATH', '/usr/lib'),
with open('bauh.desktop', 'w+') as f:
f.write(desktop_file.format(lib_path=os.getenv('BAUH_LIB_PATH', '/usr/lib'),
version=py_version,
path=fpakman_cmd))
path=app_cmd))

View File

@@ -5,22 +5,22 @@ import sys
desktop_file = """
[Desktop Entry]
Type = Application
Name = fpakman (tray)
Name = bauh ( tray )
Categories = System;
Comment = Manage your Flatpak / Snap applications
Comment = Manage your applications
Exec = {path}
Icon = {lib_path}/python{version}/site-packages/fpakman/resources/img/logo.svg
Icon = {lib_path}/python{version}/site-packages/bauh/resources/img/logo.svg
"""
py_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
fpakman_cmd = os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman') + ' --tray=1'
app_cmd = os.getenv('BAUH_PATH', '/usr/bin/bauh') + ' --tray=1'
with open('fpakman_tray.desktop', 'w+') as f:
f.write(desktop_file.format(lib_path=os.getenv('FPAKMAN_LIB_PATH', '/usr/lib'),
with open('bauh_tray.desktop', 'w+') as f:
f.write(desktop_file.format(lib_path=os.getenv('BAUH_LIB_PATH', '/usr/lib'),
version=py_version,
path=fpakman_cmd))
path=app_cmd))
with open('fpakman-tray', 'w') as f:
f.write(fpakman_cmd)
with open('bauh-tray', 'w') as f:
f.write(app_cmd)