From 1e524925ef76a843832ced10d116df25ed6dac28 Mon Sep 17 00:00:00 2001
From: liuzhen <liuzhen>
Date: Tue, 9 Oct 2018 23:34:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=8EMac=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E6=89=93=E5=8C=85=E7=9A=84=E6=A8=A1=E5=9D=97=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=A6=BB=E7=BA=BF=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Addon.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 560f51381..889394b0f 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -184,6 +184,18 @@ class Addon extends Backend
             try {
                 Service::unzip($tmpName);
                 @unlink($tmpFile);
+
+                // 兼容Mac本地打包的插件
+                $isMacOsx = 0;
+                $fileInfo = $info->getInfo();
+                $macOsxDir = $tmpAddonDir . '__MACOSX';
+                $macOsxFileDir = $tmpAddonDir . substr($fileInfo['name'], 0, -4);
+                if (is_dir($macOsxDir) && is_dir($macOsxFileDir)) {
+                    $tmpAddonDirBak = $tmpAddonDir;
+                    $isMacOsx = 1;
+                    $tmpAddonDir = $macOsxFileDir . DS;
+                }
+                
                 $infoFile = $tmpAddonDir . 'info.ini';
                 if (!is_file($infoFile)) {
                     throw new Exception(__('Addon info file was not found'));
@@ -202,6 +214,11 @@ class Addon extends Backend
 
                 //重命名插件文件夹
                 rename($tmpAddonDir, $newAddonDir);
+                // 如果是Mac，需要删除多于文件夹
+                if ($isMacOsx) {
+                    @rmdirs($tmpAddonDirBak);
+                }
+                
                 try {
                     //默认禁用该插件
                     $info = get_addon_info($name);
-- 
Gitee


From 30f6b22a9ca1dc1f90445547058fb78b71c22d18 Mon Sep 17 00:00:00 2001
From: liuzhen <liuzhen>
Date: Tue, 9 Oct 2018 23:36:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9Mac=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=9A=84=E6=8F=92=E4=BB=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Addon.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 889394b0f..f53a1a086 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -184,7 +184,6 @@ class Addon extends Backend
             try {
                 Service::unzip($tmpName);
                 @unlink($tmpFile);
-
                 // 兼容Mac本地打包的插件
                 $isMacOsx = 0;
                 $fileInfo = $info->getInfo();
-- 
Gitee


From 766e8fe65cce4e96815def2b8754e98c3870d850 Mon Sep 17 00:00:00 2001
From: liuzhen <liuzhen@bookgoal.com>
Date: Thu, 11 Oct 2018 14:20:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=89=E8=A3=85Mac?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=9A=84=E6=8F=92=E4=BB=B6=E6=97=B6=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Addon.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index f53a1a086..eb92c0aff 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -185,14 +185,9 @@ class Addon extends Backend
                 Service::unzip($tmpName);
                 @unlink($tmpFile);
                 // 兼容Mac本地打包的插件
-                $isMacOsx = 0;
-                $fileInfo = $info->getInfo();
                 $macOsxDir = $tmpAddonDir . '__MACOSX';
-                $macOsxFileDir = $tmpAddonDir . substr($fileInfo['name'], 0, -4);
-                if (is_dir($macOsxDir) && is_dir($macOsxFileDir)) {
-                    $tmpAddonDirBak = $tmpAddonDir;
-                    $isMacOsx = 1;
-                    $tmpAddonDir = $macOsxFileDir . DS;
+                if (is_dir($macOsxDir)) {
+                    @rmdirs($macOsxDir);
                 }
                 
                 $infoFile = $tmpAddonDir . 'info.ini';
@@ -213,10 +208,6 @@ class Addon extends Backend
 
                 //重命名插件文件夹
                 rename($tmpAddonDir, $newAddonDir);
-                // 如果是Mac，需要删除多于文件夹
-                if ($isMacOsx) {
-                    @rmdirs($tmpAddonDirBak);
-                }
                 
                 try {
                     //默认禁用该插件
-- 
Gitee