Add env var SHARUN_PRINTENV=1 Print environment variables to stderr (sharun)

Add env var XTABLES_LIBDIR for ${SHARUN_DIR}/shared/$LIB/xtables (sharun)
Set env var FONTCONFIG_FILE if no /etc/fonts/fonts.conf (sharun)

Author: VHSgunzo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sharun"
-version = "0.6.3"
+version = "0.6.4"
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/VHSgunzo/sharun"

README.md

@@ -47,6 +47,7 @@ cp ./target/$(uname -m)-unknown-linux-musl/release/sharun .
     SHARUN_WORKING_DIR=/path    Specifies the path to the working directory
     SHARUN_ALLOW_SYS_VKICD=1    Enables breaking system vulkan/icd.d for vulkan loader
     SHARUN_ALLOW_LD_PRELOAD=1   Enables breaking LD_PRELOAD env variable
+    SHARUN_PRINTENV=1           Print environment variables to stderr
     SHARUN_LDNAME=ld.so         Specifies the name of the interpreter
     SHARUN_DIR                  Sharun directory
 ```
@@ -184,6 +185,7 @@ This can be useful, for example, to use [ld-preload-open](https://github.com/fri
 |`PIPEWIRE_MODULE_DIR` | `${SHARUN_DIR}/shared/$LIB/pipewire-*`|
 |`GI_TYPELIB_PATH` | `${SHARUN_DIR}/shared/$LIB/girepository-*`|
 |`GBM_BACKENDS_PATH` | `${SHARUN_DIR}/shared/$LIB/gbm`|
+|`XTABLES_LIBDIR` | `${SHARUN_DIR}/shared/$LIB/xtables`|
 |||
 |---|---|
 |`XDG_DATA_DIRS` | `${SHARUN_DIR}/share`|
@@ -196,7 +198,7 @@ This can be useful, for example, to use [ld-preload-open](https://github.com/fri
 |`LIBTHAI_DICTDIR` | `${SHARUN_DIR}/share/libthai/thbrk.tri`|
 |||
 |---|---|
-|`FONTCONFIG_FILE` | `${SHARUN_DIR}/etc/fonts/fonts.conf`|
+|`FONTCONFIG_FILE` (if no /etc/fonts/fonts.conf) | `${SHARUN_DIR}/etc/fonts/fonts.conf`|
 
 ## Projects that use sharun:
 * [SoarPkgs](https://github.com/pkgforge/soarpkgs)

src/main.rs

@@ -372,6 +372,7 @@ fn print_usage() {
     SHARUN_WORKING_DIR=/path    Specifies the path to the working directory
     SHARUN_ALLOW_SYS_VKICD=1    Enables breaking system vulkan/icd.d for vulkan loader
     SHARUN_ALLOW_LD_PRELOAD=1   Enables breaking LD_PRELOAD env variable
+    SHARUN_PRINTENV=1           Print environment variables to stderr
     SHARUN_LDNAME=ld.so         Specifies the name of the interpreter
     SHARUN_DIR                  Sharun directory");
 }
@@ -692,6 +693,9 @@ fn main() {
                 if dir == "gbm" {
                     env::set_var("GBM_BACKENDS_PATH", dir_path)
                 }
+                if dir == "xtables" {
+                    env::set_var("XTABLES_LIBDIR", dir_path)
+                }
                 if dir.starts_with("spa-") {
                     env::set_var("SPA_PLUGIN_DIR", dir_path)
                 }
@@ -850,7 +854,7 @@ fn main() {
                         match name.to_str().unwrap() {
                             "fonts" => {
                                 let fonts_conf = entry_path.join("fonts.conf");
-                                if fonts_conf.exists() {
+                                if !Path::new("/etc/fonts/fonts.conf").exists() && fonts_conf.exists() {
                                     env::set_var("FONTCONFIG_FILE", fonts_conf)
                                 }
                             }
@@ -880,6 +884,13 @@ fn main() {
         env::remove_var(var_name)
     }
 
+    if get_env_var("SHARUN_PRINTENV") == "1" {
+        env::remove_var("SHARUN_PRINTENV");
+        for (k, v) in env::vars() {
+            eprintln!("{k}={v}")
+        }
+    }
+
     cfg_if! {
         if #[cfg(feature = "pyinstaller")] {
             let is_pyinstaller_elf = is_elf_section(&elf_bytes, "pydata").unwrap_or(false);