From a80f1e1523d021e563ba5a4bc5fc2c0f550de1bb Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Mon, 23 Mar 2020 11:20:42 +0500
Subject: [PATCH] bug fix: upgrade for imunify

---
 plogical/upgrade.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index d289d64bd..e83c8831a 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -1508,15 +1508,6 @@ CSRF_COOKIE_SECURE = True
 
             Upgrade.staticContent()
 
-            ### get back imunify
-
-            imunifyPublicBackup = '%s/imunify' % (imunifyPublicBackup)
-
-            try:
-                shutil.move(imunifyPublicBackup, '/usr/local/CyberCP/public')
-            except:
-                pass
-
         except:
             pass
 
@@ -2142,8 +2133,6 @@ vmail
             writeToFile.write(content)
             writeToFile.close()
 
-
-
     @staticmethod
     def upgrade(branch):
 
@@ -2233,6 +2222,19 @@ vmail
 
         ## Upgrade version
         Upgrade.fixPermissions()
+
+        ### get back imunify
+
+        imunifyPublicBackup = '/usr/local'
+        imunifyPublicBackup = '%s/imunify' % (imunifyPublicBackup)
+
+        try:
+            shutil.move(imunifyPublicBackup, '/usr/local/CyberCP/public')
+        except:
+            pass
+
+        ##
+
         Upgrade.upgradeVersion()
         Upgrade.UpdateMaxSSLCons()