From c6ca3e5c4b9b1790d9d26e385166118bc211a16a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 9 Jun 2018 14:32:02 +0100
Subject: [PATCH] Simplify

---
 src/freedombone-upgrade | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 340ea3820..32796f8fa 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -37,9 +37,6 @@ PROJECT_REPO="https://code.freedombone.net/bashrc/${PROJECT_NAME}"
 
 CURRENT_BRANCH=master
 
-# clear temporary files
-rm -rf /tmp/*
-
 # Is letsencrypt updating its certificates?
 # If yes then skip the upgrade to avoid any collisions
 if [ -f ~/temp_renewletsencrypt.txt ]; then
@@ -72,9 +69,8 @@ if [ $DEVELOPMENT_BRANCH ]; then
 fi
 
 # upgrading file prevents USB canary or other jobs from activating
-if [ ! -f /tmp/.upgrading ]; then
-    touch /tmp/.upgrading
-fi
+rm -rf /tmp/*
+touch /tmp/.upgrading
 
 if [ -f /usr/bin/backupdatabases ]; then
     if grep -q "cat /root/dbpass" /usr/bin/backupdatabases; then
-- 
GitLab