mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-22 04:25:59 +01:00
hyprpm: checkout branch and rev separately
sometimes the branch is garbled by incorrect packaging
This commit is contained in:
parent
ccbdce7c85
commit
02cbf049d2
1 changed files with 7 additions and 3 deletions
|
@ -418,11 +418,15 @@ bool CPluginManager::updateHeaders(bool force) {
|
||||||
progress.m_szCurrentMessage = "Checking out sources";
|
progress.m_szCurrentMessage = "Checking out sources";
|
||||||
progress.print();
|
progress.print();
|
||||||
|
|
||||||
ret = execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch +
|
ret = execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch + " 2>&1");
|
||||||
" 2>&1 && git rm subprojects/tracy && git submodule update --init 2>&1 && git reset --hard --recurse-submodules " + HLVER.hash);
|
|
||||||
|
|
||||||
if (m_bVerbose)
|
if (m_bVerbose)
|
||||||
progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "git returned: " + ret);
|
progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "git returned (co): " + ret);
|
||||||
|
|
||||||
|
ret = execAndGet("cd /tmp/hyprpm/hyprland && git rm subprojects/tracy && git submodule update --init 2>&1 && git reset --hard --recurse-submodules " + HLVER.hash);
|
||||||
|
|
||||||
|
if (m_bVerbose)
|
||||||
|
progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "git returned (rs): " + ret);
|
||||||
|
|
||||||
progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " checked out to running ver");
|
progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " checked out to running ver");
|
||||||
progress.m_iSteps = 3;
|
progress.m_iSteps = 3;
|
||||||
|
|
Loading…
Reference in a new issue