Manager: Implement AUR helper detection
This commit is contained in:
+44
-8
@@ -6,8 +6,10 @@
|
||||
|
||||
#include <algorithm> // replace
|
||||
#include <array>
|
||||
#include <cstdio> // fprintf, printf, stderr
|
||||
#include <cstdlib> // system
|
||||
#include <cstdio> // fprintf, printf, stderr
|
||||
#include <cstdlib> // system
|
||||
#include <filesystem> // exists
|
||||
#include <optional>
|
||||
#include <sstream> // istringstream
|
||||
#include <string> // getline
|
||||
#include <vector>
|
||||
@@ -76,11 +78,43 @@ void Package::store()
|
||||
|
||||
// -----------------------------------------
|
||||
|
||||
std::optional<std::string> Package::fetchAurHelper()
|
||||
{
|
||||
const std::string helpers[] = {
|
||||
"yay",
|
||||
"paru",
|
||||
"trizen",
|
||||
};
|
||||
|
||||
for(const auto& helper : helpers) {
|
||||
if (findDependency(helper)) {
|
||||
return { helper };
|
||||
}
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
void Package::installOrAurInstall(InstallType type)
|
||||
{
|
||||
distroDetect();
|
||||
distroDependencies();
|
||||
|
||||
std::optional<std::string> aurHelper;
|
||||
if (type == InstallType::AurInstall) {
|
||||
if (m_distro == Distro::Arch) {
|
||||
aurHelper = fetchAurHelper();
|
||||
if (!aurHelper.has_value()) {
|
||||
fprintf(stderr, "\033[31;1mPackage:\033[0m no supported AUR helper found\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
fprintf(stderr, "\033[31;1mPackage:\033[0m AUR is not supported on this distribution\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
std::string command = "";
|
||||
|
||||
Util::System $;
|
||||
@@ -94,18 +128,13 @@ void Package::installOrAurInstall(InstallType type)
|
||||
|
||||
// NOTE: Util::System does not support commands with newlines
|
||||
auto aurList = Util::Shell()("cat ./packages | " + aurCommand);
|
||||
command = "trizen -Sy --devel --needed --noconfirm " + aurList.output();
|
||||
command = aurHelper.value() + " -Sy --devel --needed --noconfirm " + aurList.output();
|
||||
}
|
||||
else {
|
||||
command = "sudo pacman -Sy --needed " + repoList.output();
|
||||
}
|
||||
}
|
||||
else if (m_distro == Distro::Debian) {
|
||||
if (type == InstallType::AurInstall) {
|
||||
fprintf(stderr, "\033[31;1mPackage:\033[0m AUR is not supported on this distribution\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// Grab everything off enabled official repositories that is in the list
|
||||
auto repoList = $("apt-cache search .").cut(1, ' ') | $("grep -xf ./packages");
|
||||
command = "sudo apt install " + repoList.output();
|
||||
@@ -119,6 +148,13 @@ void Package::installOrAurInstall(InstallType type)
|
||||
system(command.c_str());
|
||||
}
|
||||
|
||||
bool Package::findDependency(const std::string& search)
|
||||
{
|
||||
return std::filesystem::exists("/bin/" + search)
|
||||
|| std::filesystem::exists("/usr/bin/" + search)
|
||||
|| std::filesystem::exists("/usr/local/bin/" + search);
|
||||
}
|
||||
|
||||
bool Package::distroDetect()
|
||||
{
|
||||
std::string id = Machine::the().distroId();
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#ifndef PACKAGE_H
|
||||
#define PACKAGE_H
|
||||
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -32,8 +33,10 @@ public:
|
||||
void store();
|
||||
|
||||
private:
|
||||
std::optional<std::string> fetchAurHelper();
|
||||
void installOrAurInstall(InstallType type);
|
||||
|
||||
bool findDependency(const std::string& search);
|
||||
bool distroDetect();
|
||||
bool distroDependencies();
|
||||
std::string getPackageList();
|
||||
|
||||
Reference in New Issue
Block a user