install - fix branch name, remove git reset

coincashew · Jul 30, 2024 · 422ede9 · 422ede9
1 parent a22ad99
commit 422ede9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/install-nimbus-nethermind.sh b/install-nimbus-nethermind.sh
@@ -130,7 +130,7 @@ linux_update_pip() {
 linux_install_validator-install() {
     ohai "Cloning ethpillar into ~/git/ethpillar"
     mkdir -p ~/git/ethpillar
-    git clone https://github.com/coincashew/ethpillar.git ~/git/ethpillar 2> /dev/null || (cd ~/git/ethpillar ; git fetch origin master ; git checkout master ; git pull)
+    git clone https://github.com/coincashew/ethpillar.git ~/git/ethpillar 2> /dev/null || (cd ~/git/ethpillar ; git fetch origin main ; git checkout main ; git pull)
     ohai "Installing validator-install"
     $python ~/git/ethpillar/deploy-nimbus-nethermind.py
     ohai "Allowing user to view journalctl logs"

diff --git a/install.sh b/install.sh
@@ -101,7 +101,7 @@ linux_install_pre() {
 linux_install_installer() {
     ohai "Cloning ethpillar into ~/git/ethpillar"
     mkdir -p ~/git/ethpillar
-    git clone https://github.com/coincashew/ethpillar.git ~/git/ethpillar/ 2> /dev/null || (cd ~/git/ethpillar ; git fetch origin main ; git checkout main ; git pull --ff-only ; git reset --hard)
+    git clone https://github.com/coincashew/ethpillar.git ~/git/ethpillar/ 2> /dev/null || (cd ~/git/ethpillar ; git fetch origin main ; git checkout main ; git pull)
     chmod +x ~/git/ethpillar/*.sh
     ohai "Installing ethpillar"
     if [ -f /usr/local/bin/ethpillar ]; then