hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 14:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

hyprpm: trim paths in PATH

Browse source 
fixes #4210
This commit is contained in:
Vaxry 2023-12-21 22:01:50 +01:00
parent 79f3888b4b
commit 698f3b6576
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hyprpm/src/core/PluginManager.cpp
View file

@ -13,7 +13,26 @@
#include <toml++/toml.hpp> #include <toml++/toml.hpp>
std::string execAndGet(std::string cmd) { static std::string removeBeginEndSpacesTabs(std::string str) {
if (str.empty())
return str;
int countBefore = 0;
while (str[countBefore] == ' ' || str[countBefore] == '\t') {
countBefore++;
}
int countAfter = 0;
while ((int)str.length() - countAfter - 1 >= 0 && (str[str.length() - countAfter - 1] == ' ' || str[str.length() - 1 - countAfter] == '\t')) {
countAfter++;
}
str = str.substr(countBefore, str.length() - countBefore - countAfter);
return str;
}
static std::string execAndGet(std::string cmd) {
cmd += " 2>&1"; cmd += " 2>&1";
std::array<char, 128> buffer; std::array<char, 128> buffer;
std::string result; std::string result;
@ -265,7 +284,7 @@ eHeadersErrors CPluginManager::headersValid() {
if (PATH.ends_with("protocols") || PATH.ends_with("wlroots")) if (PATH.ends_with("protocols") || PATH.ends_with("wlroots"))
continue; continue;
verHeader = PATH.substr(2) + "/hyprland/src/version.h"; verHeader = removeBeginEndSpacesTabs(PATH.substr(2)) + "/hyprland/src/version.h";
break; break;
} }