From b232e2077b90408b0708064a6cbd26a7276e609d Mon Sep 17 00:00:00 2001 From: JGill Date: Sun, 24 Apr 2022 14:11:04 +0530 Subject: [PATCH 1/3] Pushing master into develop --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 525c698..b73fa99 100755 --- a/install.sh +++ b/install.sh @@ -24,7 +24,7 @@ elif [ -d ~/.oh-my-zsh ]; then export ZSH="$HOME/.config/ezsh/oh-my-zsh" mv ~/.oh-my-zsh ~/.config/ezsh/oh-my-zsh else - git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.config/ezsh/oh-my-zsh + git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git ~/.config/ezsh/oh-my-zsh fi From 31700e30ab2ac4b642a1bc15eec395672ee59263 Mon Sep 17 00:00:00 2001 From: JGill Date: Sun, 24 Apr 2022 15:03:48 +0530 Subject: [PATCH 2/3] Proper fix for oh-my-zsh update, #20 #21 --- install.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index b73fa99..93009ab 100755 --- a/install.sh +++ b/install.sh @@ -19,12 +19,14 @@ fi echo -e "Installing oh-my-zsh\n" if [ -d ~/.config/ezsh/oh-my-zsh ]; then echo -e "oh-my-zsh is already installed\n" + git -C ~/.config/ezsh/oh-my-zsh remote set-url origin https://github.com/ohmyzsh/ohmyzsh.git elif [ -d ~/.oh-my-zsh ]; then - echo -e "oh-my-zsh in already installed at '~/.oh-my-zsh'. Moving it to '~/.config/ezsh/oh-my-zsh'" - export ZSH="$HOME/.config/ezsh/oh-my-zsh" - mv ~/.oh-my-zsh ~/.config/ezsh/oh-my-zsh + echo -e "oh-my-zsh in already installed at '~/.oh-my-zsh'. Moving it to '~/.config/ezsh/oh-my-zsh'" + export ZSH="$HOME/.config/ezsh/oh-my-zsh" + mv ~/.oh-my-zsh ~/.config/ezsh/oh-my-zsh + git -C ~/.config/ezsh/oh-my-zsh remote set-url origin https://github.com/ohmyzsh/ohmyzsh.git else - git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git ~/.config/ezsh/oh-my-zsh + git clone --depth=1 https://github.com/ohmyzsh/ohmyzsh.git ~/.config/ezsh/oh-my-zsh fi From 991119a0d34b9927a3e1262167fb1278ad2bf928 Mon Sep 17 00:00:00 2001 From: JGill Date: Sun, 24 Apr 2022 15:21:29 +0530 Subject: [PATCH 3/3] New ohmyzsh repo location, putting it in after merge fix --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index b027f2e..93009ab 100755 --- a/install.sh +++ b/install.sh @@ -26,7 +26,7 @@ elif [ -d ~/.oh-my-zsh ]; then mv ~/.oh-my-zsh ~/.config/ezsh/oh-my-zsh git -C ~/.config/ezsh/oh-my-zsh remote set-url origin https://github.com/ohmyzsh/ohmyzsh.git else - git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git ~/.config/ezsh/oh-my-zsh + git clone --depth=1 https://github.com/ohmyzsh/ohmyzsh.git ~/.config/ezsh/oh-my-zsh fi