From d6c83a14d14025ce1544fd311da1e8100607b0c5 Mon Sep 17 00:00:00 2001
From: retrozinndev <joaovodias@gmail.com>
Date: Sun, 26 Oct 2025 17:01:11 -0300
Subject: [PATCH] :boom: fix(install, update): more repo branch issues

---
 install.sh | 4 +---
 update.sh  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index 7ebb1a9..6340bb4 100755
--- a/install.sh
+++ b/install.sh
@@ -58,8 +58,8 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
         if [[ -d $repo_directory ]]; then
             Send_log "repo is already cloned! let's just fetch the latest changes..."
             git -C "$repo_directory" stash # if there are changes, let's just stash them
+            git -C "$repo_directory" checkout ryo
             git -C "$repo_directory" fetch && git -C "$repo_directory" pull --rebase
-            git -C "$repo_directory" stash pop # pop changes back if there are any
         else
             git clone https://github.com/retrozinndev/colorshell.git "$repo_directory"
         fi
@@ -74,8 +74,6 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
         Send_log "Done fetching"
         Send_log "Checking out latest non-pre-release version: $latest_tag"
         git -C "$repo_directory" checkout $latest_tag > /dev/null 2>&1
-    else
-        git -C "$repo_directory" checkout ryo > /dev/null 2>&1
     fi
 
     Send_log "Starting installation..."
diff --git a/update.sh b/update.sh
index e85ec91..339e724 100755
--- a/update.sh
+++ b/update.sh
@@ -72,8 +72,8 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
         if [[ -d $repo_directory ]]; then
             Send_log "repo is already cloned! let's just fetch the latest changes..."
             git -C "$repo_directory" stash # if there are changes, let's just stash them
+            git -C "$repo_directory" checkout ryo
             git -C "$repo_directory" fetch && git -C "$repo_directory" pull --rebase
-            git -C "$repo_directory" stash pop # pop changes back if there are any
         else
             git clone https://github.com/retrozinndev/colorshell.git "$repo_directory"
         fi
@@ -89,8 +89,6 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
         Send_log "Done fetching"
         Send_log "Checking out latest non-pre-release version: $latest_tag"
         git -C "$repo_directory" checkout $latest_tag > /dev/null 2>&1
-    else
-        git -C "$repo_directory" checkout ryo > /dev/null 2>&1
     fi
 
     Send_log "Updating..."