From 3f6a53ec6bf7c90ab232e6294431f9f59cc8a398 Mon Sep 17 00:00:00 2001
From: RhodeCode Admin <admin@rhodecode.com>
Date: Fri, 1 Dec 2023 09:29:00 +0100
Subject: [PATCH] dev(dev-shell): improvements to dev shell env

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fc32eccb..c3726a81 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,7 @@ dev-sh:
 	sudo echo "deb [trusted=yes] https://apt.fury.io/rsteube/ /" | sudo tee -a "/etc/apt/sources.list.d/fury.list"
 	sudo apt-get update
 	sudo apt-get install -y zsh carapace-bin
+	rm -rf /home/rhodecode/.oh-my-zsh
 	curl https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
 	echo "source <(carapace _carapace)" > /home/rhodecode/.zsrc
 	PROMPT='%(?.%F{green}√.%F{red}?%?)%f %B%F{240}%1~%f%b %# ' zsh
@@ -139,8 +140,8 @@ dev-env:
 .PHONY: sh
 ## shortcut for make dev-sh dev-env
 sh:
-	make dev-sh
-	make dev-env
+	(make dev-env; make dev-sh)
+
 
 .PHONY: dev-srv
 ## run develop server instance, docker exec -it $(docker ps -q --filter 'name=dev-enterprise-ce') /bin/bash