Olivier/colorshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

💥 fix(install, update): more repo branch issues

Browse Source
This commit is contained in:
retrozinndev
2025-10-26 17:01:11 -03:00
parent 67688daf6e
commit d6c83a14d1
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+1 -3
View File
@@ -58,8 +58,8 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
if [[ -d $repo_directory ]]; then if [[ -d $repo_directory ]]; then
Send_log "repo is already cloned! let's just fetch the latest changes..." 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" 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" fetch && git -C "$repo_directory" pull --rebase
git -C "$repo_directory" stash pop # pop changes back if there are any
else else
git clone https://github.com/retrozinndev/colorshell.git "$repo_directory" git clone https://github.com/retrozinndev/colorshell.git "$repo_directory"
fi fi
@@ -74,8 +74,6 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
Send_log "Done fetching" Send_log "Done fetching"
Send_log "Checking out latest non-pre-release version: $latest_tag" Send_log "Checking out latest non-pre-release version: $latest_tag"
git -C "$repo_directory" checkout $latest_tag > /dev/null 2>&1 git -C "$repo_directory" checkout $latest_tag > /dev/null 2>&1
else
git -C "$repo_directory" checkout ryo > /dev/null 2>&1
fi fi
Send_log "Starting installation..." Send_log "Starting installation..."
update.sh
+1 -3
View File
@@ -72,8 +72,8 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
if [[ -d $repo_directory ]]; then if [[ -d $repo_directory ]]; then
Send_log "repo is already cloned! let's just fetch the latest changes..." 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" 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" fetch && git -C "$repo_directory" pull --rebase
git -C "$repo_directory" stash pop # pop changes back if there are any
else else
git clone https://github.com/retrozinndev/colorshell.git "$repo_directory" git clone https://github.com/retrozinndev/colorshell.git "$repo_directory"
fi fi
@@ -89,8 +89,6 @@ if [[ "$answer" == y ]] || [[ "$skip_prompts" ]]; then
Send_log "Done fetching" Send_log "Done fetching"
Send_log "Checking out latest non-pre-release version: $latest_tag" Send_log "Checking out latest non-pre-release version: $latest_tag"
git -C "$repo_directory" checkout $latest_tag > /dev/null 2>&1 git -C "$repo_directory" checkout $latest_tag > /dev/null 2>&1
else
git -C "$repo_directory" checkout ryo > /dev/null 2>&1
fi fi
Send_log "Updating..." Send_log "Updating..."