diff --git a/baseTemplate/templates/baseTemplate/versionManagment.html b/baseTemplate/templates/baseTemplate/versionManagment.html index 0f5c07d08..933030bf2 100755 --- a/baseTemplate/templates/baseTemplate/versionManagment.html +++ b/baseTemplate/templates/baseTemplate/versionManagment.html @@ -4,213 +4,231 @@ {% block content %} -{% load static %} - - - -
-
-

{% trans "Version Management" %}

-

{% trans "Here you can manage versions and check for updates to CyberPanel" %}

-
- {% if Notecheck %} -
-

{% trans "Note: Latest commit does not match, please upgrade CyberPanel." %}

-
- {% endif %} - -
-
-

- CyberPanel -

-
-
- - -
-
- - -
+ {% load static %} + + + +
+
+

{% trans "Version Management" %}

+

{% trans "Here you can manage versions and check for updates to CyberPanel" %}

+
+ {% if Notecheck %} +
+

{% trans "Note: Latest commit does not match, please upgrade CyberPanel." %}

+
+ {% endif %} + +
+
+

+ CyberPanel +

+
- -
{{ latestBuild }}
- -
{{ latestcomit }}
+ +
- -
- -
+ +
- -
-
- +
+ +
+ +
{{ currentVersion }}
+
+
+ +
{{ build }}
+ +
{{ Currentcomt }}
+
+
+ +
{{ latestVersion }}
+
+
+ +
{{ latestBuild }}
+ +
{{ latestcomit }}
+
+ + +
+ +
+
+
+ +
+
+ +
-
- - + {% endblock %} \ No newline at end of file diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 49d561c33..907c1c376 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -124,6 +124,14 @@ def stdOut(message, do_exit=0): WriteToFile.close() if do_exit: + + ### remove log file path incase its there + + if Upgrade.SoftUpgrade: + time.sleep(10) + if os.path.exists(Upgrade.LogPathNew): + os.remove(Upgrade.LogPathNew) + if Upgrade.FromCloud == 0: os._exit(0) @@ -3087,6 +3095,14 @@ def upgrade(branch): Upgrade.stdOut("Upgrade Completed.") + ### remove log file path incase its there + + if Upgrade.SoftUpgrade: + time.sleep(10) + if os.path.exists(Upgrade.LogPathNew): + os.remove(Upgrade.LogPathNew) + + def main(): parser = argparse.ArgumentParser(description='CyberPanel Installer') parser.add_argument('branch', help='Install from branch name.')