diff --git a/plogical/CyberPanelUpgrade.py b/plogical/CyberPanelUpgrade.py index 56c30d0a6..18e9995df 100644 --- a/plogical/CyberPanelUpgrade.py +++ b/plogical/CyberPanelUpgrade.py @@ -53,6 +53,9 @@ class UpgradeCyberPanel: command = 'cp -R /usr/local/CyberCP /usr/local/CyberCPBak' Upgrade.executioner(command, command) + if not Upgrade.executioner(command, command, 1): + self.PostStatus('Failed to execute %s. [404]' % (command)) + self.PostStatus('Upgrading/Downgrading to branch %s..,10' % (self.branch)) status, message = Upgrade.downloadAndUpgrade(None, self.branch) @@ -80,7 +83,6 @@ class UpgradeCyberPanel: self.PostStatus('Database updated.,55') - ## Put function here to update custom ACLs Upgrade.UpdateConfigOfCustomACL() @@ -99,12 +101,14 @@ class UpgradeCyberPanel: Upgrade.upgradeVersion() Upgrade.UpdateMaxSSLCons() + command = 'systemctl restart lscpd' + if not Upgrade.executioner(command, command, 1): + self.PostStatus('Failed to execute %s. [404]' % (command)) + self.PostStatus('CyberPanel Upgraded/Downgraded to %s. [200]' % (self.branch)) - - def main(): parser = argparse.ArgumentParser(description='CyberPanel Installer') parser.add_argument('--branch', help='Branch to install.') diff --git a/plogical/upgrade.py b/plogical/upgrade.py index b6fd5ed33..41da0fff7 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -118,7 +118,7 @@ class Upgrade: break return True except: - return 0 + return False @staticmethod def updateRepoURL(): @@ -1706,10 +1706,14 @@ imap_folder_list_limit = 0 os.chdir('/usr/local/CyberCP') command = 'git config --global user.email "support@cyberpanel.net"' - Upgrade.executioner(command, command, 1) + + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) command = 'git config --global user.name "CyberPanel"' - Upgrade.executioner(command, command, 1) + + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) command = 'git status' currentBranch = subprocess.check_output(shlex.split(command)).decode() @@ -1718,17 +1722,20 @@ imap_folder_list_limit = 0 'On branch %s-dev' % (branch)) == -1: command = 'git stash' - Upgrade.executioner(command, command, 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) command = 'git pull' - Upgrade.executioner(command, command, 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) elif currentBranch.find('not a git repository') > -1: os.chdir('/usr/local') command = 'git clone https://github.com/usmannasir/cyberpanel' - Upgrade.executioner(command, 'Download CyberPanel', 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) if os.path.exists('CyberCP'): shutil.rmtree('CyberCP') @@ -1738,16 +1745,20 @@ imap_folder_list_limit = 0 else: command = 'git fetch' - Upgrade.executioner(command, command, 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) command = 'git stash' - Upgrade.executioner(command, command, 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) command = 'git checkout %s' % (branch) - Upgrade.executioner(command, command, 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) command = 'git pull' - Upgrade.executioner(command, command, 1) + if not Upgrade.executioner(command, command, 1): + return 0, 'Failed to execute %s' % (command) ## Copy settings file diff --git a/test.php b/test.php index e69de29bb..57a4844d4 100644 --- a/test.php +++ b/test.php @@ -0,0 +1,5 @@ + \ No newline at end of file