Fix XDG_DATA_DIRS paths

mimbrero · Mar 24, 2022 · 1146355 · 1146355
1 parent 9116827
commit 1146355
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/tray-manager.ts b/src/tray-manager.ts
@@ -74,10 +74,19 @@ export default class TrayManager {
     }
 
     private findIcon(name: string) {
-        let iconPath = path.join("${XDG_DATA_DIRS}", "icons/hicolor/512x512/apps/", name);
+        let iconPath = path.join(this.getDataDir("icons/hicolor/512x512/apps/"), name);
+
         if (!fs.existsSync(iconPath))
             iconPath = path.join(this.app.getAppPath(), "data/icons/hicolor/512x512/apps/", name);
 
         return nativeImage.createFromPath(iconPath);
     }
+
+    private getDataDir(iconPath: string) {
+        for (let dataDir of process.env.XDG_DATA_DIRS.split(":")) {
+            let fullPath = path.join(dataDir, iconPath);
+            if (fs.existsSync(fullPath))
+                return fullPath;
+        }
+    }
 };