mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-25 16:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

installer: leave some space after strings

Browse Source
This commit is contained in:
Willem Melching
2021-10-08 13:49:09 +02:00
committed by Adeeb Shihadeh
parent db81bf52ea
commit e788f4f587
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/installer/installer.cc
+15 -6
View File
@@ -14,7 +14,16 @@
#include "selfdrive/ui/qt/util.h"
#include "selfdrive/ui/qt/qt_window.h"
#define GIT_URL "https://github.com/commaai/openpilot.git"
std::string get_str(std::string const s) {
std::string::size_type pos = s.find('?');
assert(pos != std::string::npos);
return s.substr(0, pos);
};
// Leave some extra space for the fork installer
const std::string GIT_URL = get_str("https://github.com/commaai/openpilot.git" "? ");
const std::string BRANCH_STR = get_str(BRANCH "? ");
#define GIT_SSH_URL "git@github.com:commaai/openpilot.git"
#ifdef QCOM
@@ -116,7 +125,7 @@ void Installer::doInstall() {
void Installer::freshClone() {
qDebug() << "Doing fresh clone";
proc.start("git", {"clone", "--progress", GIT_URL, "-b", BRANCH,
proc.start("git", {"clone", "--progress", GIT_URL.c_str(), "-b", BRANCH_STR.c_str(),
"--depth=1", "--recurse-submodules", TMP_INSTALL_PATH});
}
@@ -126,12 +135,12 @@ void Installer::cachedFetch(const QString &cache) {
run(QString("cp -rp %1 %2").arg(cache, TMP_INSTALL_PATH).toStdString().c_str());
int err = chdir(TMP_INSTALL_PATH);
assert(err == 0);
run("git remote set-branches --add origin " BRANCH);
run(("git remote set-branches --add origin " + BRANCH_STR).c_str());
updateProgress(10);
proc.setWorkingDirectory(TMP_INSTALL_PATH);
proc.start("git", {"fetch", "--progress", "origin", BRANCH});
proc.start("git", {"fetch", "--progress", "origin", BRANCH_STR.c_str()});
}
void Installer::readProgress() {
@@ -165,8 +174,8 @@ void Installer::cloneFinished(int exitCode, QProcess::ExitStatus exitStatus) {
// ensure correct branch is checked out
int err = chdir(TMP_INSTALL_PATH);
assert(err == 0);
run("git checkout " BRANCH);
run("git reset --hard origin/" BRANCH);
run(("git checkout " + BRANCH_STR).c_str());
run(("git reset --hard origin/" + BRANCH_STR).c_str());
// move into place
run("mv " TMP_INSTALL_PATH " " INSTALL_PATH);