From 355b47d93a77fb4de77d35dc88272bfcaa193638 Mon Sep 17 00:00:00 2001 From: q5sys Date: Thu, 2 Nov 2017 10:10:56 -0400 Subject: [PATCH] cut old source source from systemmanager.cpp --- src/server/library/sysadm-systemmanager.cpp | 63 --------------------- 1 file changed, 63 deletions(-) diff --git a/src/server/library/sysadm-systemmanager.cpp b/src/server/library/sysadm-systemmanager.cpp index c93077a..cdb6ffc 100644 --- a/src/server/library/sysadm-systemmanager.cpp +++ b/src/server/library/sysadm-systemmanager.cpp @@ -455,66 +455,3 @@ QJsonObject SysMgmt::systemDevices(){ return pciconf_info; } -// Source Management - -QJsonObject SysMgmt::fetchPortsTree(QString altDir){ -//void SysMgmt::fetchPortsTree(QStringList &cmds, QStringList &dirs){ - QJsonObject out; - if(altDir.isEmpty()){ altDir = "/usr/ports"; } - //Does Ports tree exist? If not create it. - if(!QFile::exists(altDir)){ - QDir dir; - if(!dir.mkpath(altDir) ){ - out.insert("error","Could not create directory: "+altDir); - return out; - } - } - //Does a local git repo exist? If not create it. - QString URL = "https://www.github.com/trueos/freebsd-ports.git"; - if(QFile::exists(altDir+"/.git")){ - //Check if the remote URL is correct - QString origin = General::gitCMD(altDir, "git remote show -n origin").filter("Fetch URL:").join("").section("URL:",1,30).simplified(); - if(origin != URL){ - General::gitCMD(altDir,"git",QStringList() << "remote" << "remove" << "origin"); - General::gitCMD(altDir,"git", QStringList() << "remote" << "add" << "origin" << URL); - } - }else{ - //new GIT setup - General::emptyDir(altDir); - General::gitCMD(altDir, "git", QStringList() << "init" << altDir ); - General::gitCMD(altDir, "git", QStringList() << "remote" << "add" << "origin" << URL ); - } - //Now update the tree with git - QString ID = "system_fetch_ports_tree"; - DISPATCHER->queueProcess(ID, "git pull origin", altDir ); - out.insert("result","process_started"); - out.insert("process_id",ID); - return out; -} - -/*void SysMgmt::fetchSourceTree(QString branch, QStringList &cmds, QStringList &dirs, QStringList &info){ - //Clear the output variables - cmds.clear(); dirs.clear(); - //Check if the source directory even exists - if(!QFile::exists("/usr/src")){ - cmds << "mkdir /usr/src"; dirs << ""; //Create the ports tree - } - //Now check if the git directory exists - QString URL = "https://www.github.com/pcbsd/freebsd.git"; - if(QFile::exists("/usr/src/.git")){ - //Check if the remote URL is correct - QString origin = General::gitCMD("/usr/src", "git remote show -n origin").filter("Fetch URL:").join("").section("URL:",1,30).simplified(); - if(origin != URL){ - cmds << "git remote remove origin"; dirs <<"/usr/src"; - cmds << "git remote add origin "+URL; dirs << "/usr/src/.git"; //setup PC-BSD git repo - } - }else{ - //new GIT setup - General::emptyDir("/usr/src"); - cmds << "git init"; dirs << "/usr/src"; //setup git - cmds << "git remote add origin "+URL; dirs << "/usr/src/.git"; //setup PC-BSD git repo - } - //Now update the tree with git - cmds << "git fetch --depth=1"; dirs << "/usr/src/.git"; - cmds << "git checkout "+branch; dirs << "/usr/src"; -}*/