From d07736682e301d36009b5dc122dda2ae217d318b Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Thu, 28 Mar 2024 15:07:49 -0500 Subject: [PATCH] Fixing git issues. --- server_config/debian/debian-setup.sh | 30 ++++++++++++++++++++-------- server_config/ubuntu/ubuntu-setup.sh | 28 ++++++++++++++++++-------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/server_config/debian/debian-setup.sh b/server_config/debian/debian-setup.sh index 523869c..5d3764a 100644 --- a/server_config/debian/debian-setup.sh +++ b/server_config/debian/debian-setup.sh @@ -12,14 +12,28 @@ sudo apt install git -y # installing cockpit sudo apt install cockpit -y -# mkdir for git repo -sudo mkdir /home/traver -sudo mkdir /home/traver/public-setupfiles -cd /home/traver/public-setupfiles -git init -git remote add origin https://github.com/wickedyoda/public-setupfiles -git pull -git checkout main +# Check if /home/traver/public-setupfiles exists +if [ -d "/home/traver/public-setupfiles" ]; then + # Change directory to /home/traver/public-setupfiles + cd /home/traver/public-setupfiles + + # Stash any local changes + git stash + + # Pull the latest changes from the remote repository + git pull +else + # mkdir for git repo + sudo mkdir -p /home/traver/public-setupfiles + cd /home/traver/public-setupfiles + git init + git remote add origin https://github.com/wickedyoda/public-setupfiles + git pull origin main + git checkout main + +fi + + # Change permissions sudo chmod +x -R /home/traver/public-setupfiles diff --git a/server_config/ubuntu/ubuntu-setup.sh b/server_config/ubuntu/ubuntu-setup.sh index 907d52b..31c1ced 100644 --- a/server_config/ubuntu/ubuntu-setup.sh +++ b/server_config/ubuntu/ubuntu-setup.sh @@ -9,14 +9,26 @@ sudo apt install git -y # installing cockpit sudo apt install cockpit -y -# mkdir for git repo -sudo mkdir /home/traver -sudo mkdir /home/traver/public-setupfiles -cd /home/traver/public-setupfiles -git init -git remote add origin https://github.com/wickedyoda/public-setupfiles -git pull -git checkout main +# Check if /home/traver/public-setupfiles exists +if [ -d "/home/traver/public-setupfiles" ]; then + # Change directory to /home/traver/public-setupfiles + cd /home/traver/public-setupfiles + + # Stash any local changes + git stash + + # Pull the latest changes from the remote repository + git pull +else + # mkdir for git repo + sudo mkdir -p /home/traver/public-setupfiles + cd /home/traver/public-setupfiles + git init + git remote add origin https://github.com/wickedyoda/public-setupfiles + git pull origin main + git checkout main + +fi # Change permissions sudo chmod +x -R /home/traver/public-setupfiles