diff options
| author | Vaxry <[email protected]> | 2024-04-15 18:49:19 +0100 |
|---|---|---|
| committer | Vaxry <[email protected]> | 2024-04-15 19:16:25 +0100 |
| commit | 02cbf049d2fbecfe64fc80e0ce388a6ac240bcb6 (patch) | |
| tree | 71ca45cdc04c0067778f5e75b63600b5aa73d63a | |
| parent | ccbdce7c8528781020b39ddf4498277df5e5e78d (diff) | |
| download | Hyprland-02cbf049d2fbecfe64fc80e0ce388a6ac240bcb6.tar.gz Hyprland-02cbf049d2fbecfe64fc80e0ce388a6ac240bcb6.zip | |
hyprpm: checkout branch and rev separately
sometimes the branch is garbled by incorrect packaging
| -rw-r--r-- | hyprpm/src/core/PluginManager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/hyprpm/src/core/PluginManager.cpp b/hyprpm/src/core/PluginManager.cpp index 6a752623..6d3da92e 100644 --- a/hyprpm/src/core/PluginManager.cpp +++ b/hyprpm/src/core/PluginManager.cpp @@ -418,11 +418,15 @@ bool CPluginManager::updateHeaders(bool force) { progress.m_szCurrentMessage = "Checking out sources"; progress.print(); - ret = execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch + - " 2>&1 && git rm subprojects/tracy && git submodule update --init 2>&1 && git reset --hard --recurse-submodules " + HLVER.hash); + ret = execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch + " 2>&1"); 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.m_iSteps = 3; |