fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Platform: add $EXE_PATH/../share to dataDir

Browse Source 
Support loading presets when fastfetch is installed in a special path. eg. `/opt/homebrew/bin/`
This commit is contained in:
李通洲
2023-08-24 10:49:59 +08:00
parent ce47a82fb5
commit 28c01599d5
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/terminalshell/terminalshell_linux.c
+1 -1
View File
@@ -48,7 +48,7 @@ static void getProcessInformation(pid_t pid, FFstrbuf* processName, FFstrbuf* ex
if(length > 0)
exe->length = (uint32_t)length;
#else
#elif defined(__FreeBSD__)
size_t size = exe->allocated;
if(!sysctl(
src/util/platform/FFPlatform_unix.c
+32 -1
View File
@@ -5,8 +5,15 @@
#include <unistd.h>
#include <pwd.h>
#include <limits.h>
#include <sys/utsname.h>
#ifdef __APPLE__
#include <libproc.h>
#elif defined(__FreeBSD__)
#include <sys/sysctl.h>
#endif
static void platformPathAddEnv(FFlist* dirs, const char* env)
{
const char* envValue = getenv(env);
@@ -82,7 +89,31 @@ static void getDataDirs(FFPlatform* platform)
platformPathAddEnv(&platform->dataDirs, "XDG_DATA_HOME");
ffPlatformPathAddHome(&platform->dataDirs, platform, ".local/share/");
#if defined(__APPLE__)
// Add ${currentExePath}/../share
FF_STRBUF_AUTO_DESTROY exePath = ffStrbufCreateA(PATH_MAX);
#ifdef __linux__
ssize_t exePathLen = readlink("/proc/self/exe", exePath.chars, exePath.allocated);
#elif defined(__APPLE__)
int exePathLen = proc_pidpath((int) getpid(), exePath.chars, exePath.allocated);
#elif defined(__FreeBSD__)
size_t exePathLen = exePath.allocated;
if(sysctl(
(int[]){CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, (int) getpid()}, 4,
exePath.chars, &exePathLen,
NULL, 0
))
exePathLen = 0;
#endif
if (exePathLen > 0)
{
exePath.length = (uint32_t) exePathLen;
ffStrbufSubstrBeforeLastC(&exePath, '/');
ffStrbufSubstrBeforeLastC(&exePath, '/');
ffStrbufAppendS(&exePath, "/share");
ffPlatformPathAddAbsolute(&platform->dataDirs, exePath.chars);
}
#ifdef __APPLE__
ffPlatformPathAddHome(&platform->dataDirs, platform, "Library/Application Support/");
#endif