From c6319ccd4f0673e563b5e29794f895bd572b3f1e Mon Sep 17 00:00:00 2001
From: Thomas Balthazar <thomas@balthazar.info>
Date: Sun, 12 Nov 2017 21:22:06 +0100
Subject: [PATCH] Switch to master branch before pulling

---
 scripts/upgrade | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 416052a..71d2fc3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -28,12 +28,16 @@ if [[ "$version" == "0.2.1" ]]; then
     version="0.2.2"
 
     cd $RENEW_CERT_PATH
+    git checkout master
     git pull origin master
     sudo ve/bin/python renew_from_cube.py --cron
 
     cat <<EOF > /etc/cron.daily/neutrinet-renew-cert
 #!/bin/bash
-cd $RENEW_CERT_PATH && git pull origin master && ve/bin/python renew_from_cube.py --cron
+cd $RENEW_CERT_PATH
+git checkout master
+git pull origin master
+ve/bin/python renew_from_cube.py --cron
 EOF
     chmod 0755 /etc/cron.daily/neutrinet-renew-cert
 fi
-- 
GitLab