mirror/waydroid
1
0
Fork 0
mirror of https://github.com/waydroid/waydroid.git synced 2026-04-20 23:19:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

packaging: install icons to xdg icons resource path, and get the .desktop file to use relative icon name

Browse Source
This commit is contained in:
Mo 森
2022-03-28 21:08:33 +07:00
committed by Alessandro Astone
parent 72aa95b191
commit 574405d056
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -8,6 +8,7 @@ WAYDROID_DIR := $(PREFIX)/lib/waydroid
BIN_DIR := $(PREFIX)/bin
APPS_DIR := $(PREFIX)/share/applications
METAINFO_DIR := $(PREFIX)/share/metainfo
ICONS_DIR := $(PREFIX)/share/icons
SYSD_DIR := $(PREFIX)/lib/systemd/system
DBUS_DIR := $(PREFIX)/share/dbus-1
POLKIT_DIR := $(PREFIX)/share/polkit-1
@@ -17,6 +18,7 @@ INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
INSTALL_ICONS_DIR := $(DESTDIR)$(ICONS_DIR)
INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)
INSTALL_DBUS_DIR := $(DESTDIR)$(DBUS_DIR)
INSTALL_POLKIT_DIR := $(DESTDIR)$(POLKIT_DIR)
@@ -26,9 +28,11 @@ build:
@echo "Nothing to build, run 'make install' to copy the files!"
install:
install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
install -d $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_ICONS_DIR)/hicolor/512x512/apps
cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
ln -sf $(WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/

2
data/Waydroid.desktop
View File

@@ -2,5 +2,5 @@
Type=Application
Name=Waydroid
Exec=waydroid first-launch
Icon=/usr/lib/waydroid/data/AppIcon.png
Icon=waydroid
X-Purism-FormFactor=Workstation;Mobile;

2
tools/services/user_manager.py
View File

@@ -45,7 +45,7 @@ def start(args, session, unlocked_cb=None):
lines.append("X-Purism-FormFactor=Workstation;Mobile;")
if hide:
lines.append("NoDisplay=true")
lines.append("Icon=" + tools.config.tools_src + "/data/AppIcon.png")
lines.append("Icon=waydroid")
desktop_file = open(desktop_file_path, "w")
for line in lines:
desktop_file.write(line + "\n")