From 9c75e5db4a5b7da0c78b68b16b7fa3323dbb5c2d Mon Sep 17 00:00:00 2001
From: Naibo Wang <naibowang@NaibodeMacBook-Pro.local>
Date: Sun, 28 May 2023 00:22:41 +0800
Subject: [PATCH] fix zsh

---
 ElectronJS/config.json                  | 2 +-
 ElectronJS/package_macos.sh             | 4 ++--
 ElectronJS/src/taskGrid/invokeTask.html | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ElectronJS/config.json b/ElectronJS/config.json
index d7f6cab..78a2110 100644
--- a/ElectronJS/config.json
+++ b/ElectronJS/config.json
@@ -1 +1 @@
-{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","absolute_user_data_folder":"D:\\Documents\\Projects\\EasySpider\\ElectronJS\\user_data"}
\ No newline at end of file
+{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","absolute_user_data_folder":"/Users/naibowang/Documents/EasySpider/ElectronJS/user_data"}
\ No newline at end of file
diff --git a/ElectronJS/package_macos.sh b/ElectronJS/package_macos.sh
index cbcb6ec..0990d5c 100755
--- a/ElectronJS/package_macos.sh
+++ b/ElectronJS/package_macos.sh
@@ -10,6 +10,6 @@ rm ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/V
 rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/chrome_win64
 rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/Data
 rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/.idea
-# rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/tasks
-# rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/execution_instances
+rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/tasks
+rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/execution_instances
 rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/user_data
diff --git a/ElectronJS/src/taskGrid/invokeTask.html b/ElectronJS/src/taskGrid/invokeTask.html
index eb39005..5433bcc 100644
--- a/ElectronJS/src/taskGrid/invokeTask.html
+++ b/ElectronJS/src/taskGrid/invokeTask.html
@@ -300,6 +300,11 @@
             } else if(OSInfo.version == 'linux'){
                 app.$data.command = "./EasySpider/resources/app/chrome_linux64/easyspider_executestage --id '[" + app.$data.ID.toString() + "]' --user_data " + (app.$data.with_user_data ? "1" : "0") + " --server_address " + app.$data.backEndAddressServiceWrapper;
             } else if(OSInfo.version == 'darwin'){
+                if(getUrlParam("lang") == "zh"){
+                    app.$data.easyspider_location = "你的EasySpider文件夹，如：cd /Users/你的用户名/Downloads/EasySpider_MacOS_all_arch";
+                } else {
+                    app.$data.easyspider_location = "Your EasySpider folder, such as: cd /Users/Your Username/Downloads/EasySpider_MacOS_all_arch";
+                }
                 app.$data.command = "./easyspider_executestage --id '[" + app.$data.ID.toString() + "]' --user_data " + (app.$data.with_user_data ? "1" : "0") + " --server_address " + app.$data.backEndAddressServiceWrapper;
             }
         });