From 5c56adeb403ffbc42a287ab8161d8e308bdbff5a Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 12 Jun 2020 12:08:15 +0500
Subject: [PATCH] bug fix restic

---
 .../templates/emailMarketing/manageLists.html | 35 +++++++++----------
 install/install.py                            | 20 +++++++++--
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/emailMarketing/templates/emailMarketing/manageLists.html b/emailMarketing/templates/emailMarketing/manageLists.html
index c7c5c4dd0..b9db0a947 100755
--- a/emailMarketing/templates/emailMarketing/manageLists.html
+++ b/emailMarketing/templates/emailMarketing/manageLists.html
@@ -73,9 +73,8 @@
                                             class="btn ra-100 btn-blue-alt">{% trans 'Verify' %}</button>
                                 </div>
                                 <div class="col-sm-3">
-                                    <a target="_blank" href="/emailMarketing/{{ domain }}/configureVerify">
-                                        <button class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
-                                    </a>
+                                    <button onclick="location.href='/emailMarketing/{{ domain }}/configureVerify'"
+                                            class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
                                 </div>
                                 <div class="col-sm-3">
                                     <button ng-click="fetchLogs()" data-toggle="modal" data-target="#verificationLogs"
@@ -99,21 +98,21 @@
                                                     <div ng-hide="currentRecords" class="form-group">
 
                                                         <table style="margin: 0px; padding-bottom: 2%" class="table">
-                                                                <thead>
-                                                                <tr>
-                                                                    <th>{% trans "Total Emails" %}</th>
-                                                                    <th>{% trans "Verified" %}</th>
-                                                                    <th>{% trans "Not-Verified" %}</th>
-                                                                </tr>
-                                                                </thead>
-                                                                <tbody>
-                                                                <tr>
-                                                                    <td>{$ totalEmails $}</td>
-                                                                    <td>{$ verified $}</td>
-                                                                    <td>{$ notVerified $}</td>
-                                                                </tr>
-                                                                </tbody>
-                                                            </table>
+                                                            <thead>
+                                                            <tr>
+                                                                <th>{% trans "Total Emails" %}</th>
+                                                                <th>{% trans "Verified" %}</th>
+                                                                <th>{% trans "Not-Verified" %}</th>
+                                                            </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                            <tr>
+                                                                <td>{$ totalEmails $}</td>
+                                                                <td>{$ verified $}</td>
+                                                                <td>{$ notVerified $}</td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
 
                                                         <div class="col-sm-10">
                                                             <input placeholder="Search Logs..." name="dom" type="text"
diff --git a/install/install.py b/install/install.py
index 30183937d..6dff30fd7 100755
--- a/install/install.py
+++ b/install/install.py
@@ -1950,10 +1950,24 @@ milter_default_action = accept
 
                 if self.distro == centos:
                     command = 'yum --enablerepo=CyberPanel install restic -y'
-                else:
-                    command = 'dnf install restic -y --nogpgcheck'
+                    preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
+                elif self.distro == cent8:
+
+                    command = 'cat /proc/cpuinfo'
+
+                    result = subprocess.check_output(shlex.split(command)).decode("utf-8")
+
+                    if result.find('ARM') > -1 or result.find('arm') > -1:
+                        command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_arm64'
+                        preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
+
+                    else:
+                        command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_amd64'
+                        preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
+
+                    command = 'chmod +x /usr/bin/restic'
+                    preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
 
-                preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
             else:
                 command = 'apt-get update -y'
                 preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)