fix: use /usr/libexec/.. for plugins instead of /usr/lib/..

This commit changes plugins to use /usr/libexec instead of /usr/lib. Since the plugins contain executables, the more apt directory for this need is /usr/libexec. Fedora is requiring this in order to package pop-launcher and cosmic-launcher, so this patch will be used for downstream Fedora, but if upstream would like to adopt this change, I've brought it here just in case! :)

Signed-off-by: Ryan Brue <[email protected]>

Author: ryanabx

README.md

@@ -45,7 +45,7 @@ just plugins="calc desktop_entries files find pop_shell pulse recent scripts ter
 
 - User-local plugins: `~/.local/share/pop-launcher/plugins/{plugin}/`
 - System-wide install for system administrators: `/etc/pop-launcher/plugins/{plugin}/`
-- Distribution packaging: `/usr/lib/pop-launcher/plugins/{plugin}/`
+- Distribution packaging: `/usr/libexec/pop-launcher/plugins/{plugin}/`
 
 ## Plugin Config
 
@@ -79,7 +79,7 @@ A plugin's metadata is defined `pop-launcher/plugins/{plugin}/plugin.ron`.
 
 - User-local scripts: `~/.local/share/pop-launcher/scripts`
 - System-wide install for system administrators: `/etc/pop-launcher/scripts`
-- Distribution packaging: `/usr/lib/pop-launcher/scripts`
+- Distribution packaging: `/usr/libexec/pop-launcher/scripts`
 
 Example script
 <details>

debian/pop-launcher-system76-power.install

@@ -1 +1 @@
-/usr/lib/pop-launcher/scripts/system76-power
+/usr/libexec/pop-launcher/scripts/system76-power

debian/pop-launcher.install

@@ -1,3 +1,3 @@
 /usr/bin/
-/usr/lib/pop-launcher/plugins/
-/usr/lib/pop-launcher/scripts/session/
+/usr/libexec/pop-launcher/plugins/
+/usr/libexec/pop-launcher/scripts/session/

debian/pop-launcher.links

@@ -1,11 +1,11 @@
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/calc/calc
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/desktop_entries/desktop-entries
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/files/files
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/find/find
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/pop_shell/pop-shell
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/pulse/pulse
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/recent/recent
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/scripts/scripts
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/terminal/terminal
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/web/web
-/usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/cosmic_toplevel/cosmic-toplevel
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/calc/calc
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/desktop_entries/desktop-entries
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/files/files
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/find/find
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/pop_shell/pop-shell
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/pulse/pulse
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/recent/recent
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/scripts/scripts
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/terminal/terminal
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/web/web
+/usr/bin/pop-launcher /usr/libexec/pop-launcher/plugins/cosmic_toplevel/cosmic-toplevel

debian/rules

@@ -32,4 +32,4 @@ override_dh_auto_install:
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod +x debian/pop-launcher/usr/lib/pop-launcher/scripts/**/*.sh
+	chmod +x debian/pop-launcher/usr/libexec/pop-launcher/scripts/**/*.sh

justfile

@@ -15,7 +15,7 @@ base-dir := if rootdir == '' {
 lib-dir := if rootdir == '' {
     base-dir / 'share'
 } else {
-    base-dir / 'lib'
+    base-dir / 'libexec'
 }
 
 bin-dir := base-dir / 'bin'

plugins/src/scripts/mod.rs

@@ -15,7 +15,7 @@ use tokio::process::Command;
 
 const LOCAL_PATH: &str = ".local/share/pop-launcher/scripts";
 const SYSTEM_ADMIN_PATH: &str = "/etc/pop-launcher/scripts";
-const DISTRIBUTION_PATH: &str = "/usr/lib/pop-launcher/scripts";
+const DISTRIBUTION_PATH: &str = "/usr/libexec/pop-launcher/scripts";
 
 pub async fn main() {
     let mut requests = json_input_stream(async_stdin());

src/lib.rs

@@ -19,7 +19,7 @@ pub const LOCAL_PLUGINS: &str = concatcp!(LOCAL, "/plugins");
 pub const SYSTEM: &str = "/etc/pop-launcher";
 pub const SYSTEM_PLUGINS: &str = concatcp!(SYSTEM, "/plugins");
 
-pub const DISTRIBUTION: &str = "/usr/lib/pop-launcher";
+pub const DISTRIBUTION: &str = "/usr/libexec/pop-launcher";
 pub const DISTRIBUTION_PLUGINS: &str = concatcp!(DISTRIBUTION, "/plugins");
 
 pub const PLUGIN_PATHS: &[&str] = &[LOCAL_PLUGINS, SYSTEM_PLUGINS, DISTRIBUTION_PLUGINS];