Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-aux/flatpak/io.github.kolunmi.Bazaar.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"runtime": "org.gnome.Platform",
"runtime-version": "50",
"sdk": "org.gnome.Sdk",
"command": "bazaar",
"command": "bazaar-daemon",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.llvm20"
],
Expand Down
2 changes: 1 addition & 1 deletion data/dbus/io.github.kolunmi.Bazaar.service.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=io.github.kolunmi.Bazaar
SystemdService=io.github.kolunmi.Bazaar.service
Exec=@bindir@/bazaar service
Exec=@bindir@/bazaar-daemon service
4 changes: 2 additions & 2 deletions data/io.github.kolunmi.Bazaar.desktop.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Bazaar
Comment=Add, remove or update flatpak software on this computer
Exec=bazaar %U
Exec=bazaar-daemon %U
Icon=io.github.kolunmi.Bazaar
Terminal=false
Type=Application
Expand All @@ -14,4 +14,4 @@ X-Purism-FormFactor=Workstation;Mobile;

[Desktop Action new-window]
Name=New Window
Exec=bazaar %U
Exec=bazaar-daemon %U
2 changes: 1 addition & 1 deletion data/io.github.kolunmi.Bazaar.search-provider.ini.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Shell Search Provider]
DesktopId=io.github.kolunmi.Bazaar.desktop
BusName=io.github.kolunmi.Bazaar
BusName=io.github.kolunmi.Bazaar.SearchProvider
ObjectPath=/io/github/kolunmi/Bazaar/SearchProvider
Version=2
2 changes: 1 addition & 1 deletion data/io.github.kolunmi.Bazaar.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ PartOf=graphical-session.target
[Service]
Type=dbus
BusName=io.github.kolunmi.Bazaar
ExecStart=@bindir@/bazaar --no-window
ExecStart=@bindir@/bazaar-daemon --no-window
7 changes: 7 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ else
dl_worker_bin_name = 'bazaar-dl-worker'
config_h.set_quoted('DL_WORKER_BIN_NAME', dl_worker_bin_name)

daemon_bin_name = 'bazaar-daemon'
config_h.set_quoted('DAEMON_BIN_NAME', daemon_bin_name)

bazaar_bin_name = 'bazaar'
config_h.set_quoted('BAZAAR_BIN_NAME', bazaar_bin_name)
config_h.set_quoted('BAZAAR_BIN_PATH', get_option('prefix') / get_option('bindir') / bazaar_bin_name)

if get_option('hardcoded_main_config_path') != ''
config_h.set_quoted('HARDCODED_MAIN_CONFIG', get_option('hardcoded_main_config_path'))
endif
Expand Down
Loading
Loading