aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <adamdharrison@gmail.com>2023-06-20 14:34:32 -0400
committerGitHub <noreply@github.com>2023-06-20 14:34:32 -0400
commitdcb46d8e39b673b11cd6b225103291fc03003343 (patch)
tree68326bd055d70ddb7ea900c30e255aa44bccf8af
parent0109b96e682f6a50ab8d12931ff9f27dedb0e4d2 (diff)
parent6ab6705f8c3a958ae5de159d609b0c2ef5550dae (diff)
downloadlite-xl-plugin-manager-dcb46d8e39b673b11cd6b225103291fc03003343.tar.gz
lite-xl-plugin-manager-dcb46d8e39b673b11cd6b225103291fc03003343.zip
Merge pull request #29 from lite-xl/PR/remove-sysconfig
Removed system configuration search paths.
-rwxr-xr-xbuild.sh2
-rw-r--r--src/lpm.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 43343d6..6805532 100755
--- a/build.sh
+++ b/build.sh
@@ -39,7 +39,7 @@ fi
# Build the pre-packaged lua file into the executbale.
if [[ "$@" == *"-DLPM_STATIC"* ]]; then
[[ ! -e "lua.exe" ]] && gcc -Ilib/lua -o lua.exe lib/lua/onelua.c -lm
- ./lua.exe -e 'f = string.dump(assert(loadfile("src/lpm.lua"))) io.open("src/lpm.lua.c", "wb"):write("unsigned char lpm_luac[] = \"" .. f:gsub(".", function (c) return string.format("\\x%02X",string.byte(c)) end) .. "\";unsigned int lpm_luac_len = " .. #f .. ";")'
+ ./lua.exe -e 'io.open("src/lpm.lua.c", "wb"):write("unsigned char lpm_luac[] = \""..string.dump(loadfile("src/lpm.lua")):gsub(".",function(c) return string.format("\\x%02X",string.byte(c)) end).."\";unsigned int lpm_luac_len = sizeof(lpm_luac)-1;")'
fi
[[ $OSTYPE != 'msys'* && $CC != *'mingw'* && $CC != "emcc" ]] && CFLAGS="$CFLAGS -DLUA_USE_LINUX" && LDFLAGS="$LDFLAGS -ldl"
diff --git a/src/lpm.c b/src/lpm.c
index 8c19209..1f11127 100644
--- a/src/lpm.c
+++ b/src/lpm.c
@@ -324,6 +324,9 @@ static void git_init() {
git_libgit2_init();
if (git_cert_type)
git_libgit2_opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, git_cert_type == 2 ? git_cert_path : NULL, git_cert_type == 1 ? git_cert_path : NULL);
+ git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, ".");
+ git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, ".");
+ git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, ".");
git_initialized = 1;
}
}