From 6de79922c53600a92aaff972958bef7f8b7ac9ac Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Wed, 25 Nov 2020 01:18:26 +0000
Subject: [PATCH] fix git failing to switch branches during update

---
 install.sh | 4 +++-
 update.sh  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 install.sh

diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index 508f04c3..b0d2171b
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="21"
+SCRIPT_VERSION="22"
 SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/develop/install.sh'
 
 GREEN='\033[0;32m'
@@ -284,6 +284,8 @@ sudo mkdir -p /var/log/celery
 sudo chown ${USER}:${USER} /var/log/celery
 git clone https://github.com/wh1te909/tacticalrmm.git /rmm/
 cd /rmm
+git config user.email "admin@example.com"
+git config user.name "Bob"
 git checkout master
 
 localvars="$(cat << EOF
diff --git a/update.sh b/update.sh
index 61cfe6ea..95ae1521 100644
--- a/update.sh
+++ b/update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="96"
+SCRIPT_VERSION="97"
 SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/develop/update.sh'
 LATEST_SETTINGS_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py'
 YELLOW='\033[1;33m'
@@ -63,6 +63,8 @@ sudo systemctl stop ${i}
 done
 
 cd /rmm
+git config user.email "admin@example.com"
+git config user.name "Bob"
 git fetch
 git checkout master
 git reset --hard FETCH_HEAD