Merge pull request #110 from xianyunleo/dev

Dev
xianyunleo · May 29, 2024 · e5a91e7 · e5a91e7
2 parents e622879 + 87ce8ff
commit e5a91e7
Show file tree

Hide file tree

Showing 42 changed files with 1,277 additions and 1,281 deletions.
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -17,8 +17,6 @@ mac:
   extraFiles:
     - from: ./extra/darwin/Core/Library/
       to: ./Core/Library/
-    - from: ./extra/darwin/Core/config/
-      to: ./Core/config/
     - from: ./extra/darwin/Core/initFiles/
       to: ./Core/initFiles/
     - from: ./extra/darwin/Core/script/
@@ -39,8 +37,6 @@ win:
         - x64
   requestedExecutionLevel: requireAdministrator
   extraFiles:
-    - from: ./extra/win32/core/config/
-      to: ./core/config/
     - from: ./extra/win32/core/initFiles/
       to: ./core/initFiles/
     - from: ./extra/win32/core/script/

diff --git a/...in/Core/config/software/icon/Composer.png → ...itFiles/config/software/icon/Composer.png b/...in/Core/config/software/icon/Composer.png → ...itFiles/config/software/icon/Composer.png
diff --git a/...n/Core/config/software/icon/Notepad--.png → ...tFiles/config/software/icon/Notepad--.png b/...n/Core/config/software/icon/Notepad--.png → ...tFiles/config/software/icon/Notepad--.png
diff --git a/...Core/config/software/icon/NotepadNext.svg → ...iles/config/software/icon/NotepadNext.svg b/...Core/config/software/icon/NotepadNext.svg → ...iles/config/software/icon/NotepadNext.svg
diff --git a/...rwin/Core/config/software/icon/apache.png → ...initFiles/config/software/icon/apache.png b/...rwin/Core/config/software/icon/apache.png → ...initFiles/config/software/icon/apache.png
diff --git a/...win/Core/config/software/icon/mariadb.png → ...nitFiles/config/software/icon/mariadb.png b/...win/Core/config/software/icon/mariadb.png → ...nitFiles/config/software/icon/mariadb.png
diff --git a/...n/Core/config/software/icon/memcached.png → ...tFiles/config/software/icon/memcached.png b/...n/Core/config/software/icon/memcached.png → ...tFiles/config/software/icon/memcached.png
diff --git a/...arwin/Core/config/software/icon/mysql.png → .../initFiles/config/software/icon/mysql.png b/...arwin/Core/config/software/icon/mysql.png → .../initFiles/config/software/icon/mysql.png
diff --git a/...arwin/Core/config/software/icon/nginx.png → .../initFiles/config/software/icon/nginx.png b/...arwin/Core/config/software/icon/nginx.png → .../initFiles/config/software/icon/nginx.png
diff --git a/.../darwin/Core/config/software/icon/php.png → ...re/initFiles/config/software/icon/php.png b/.../darwin/Core/config/software/icon/php.png → ...re/initFiles/config/software/icon/php.png
diff --git a/.../Core/config/software/icon/phpmyadmin.png → ...Files/config/software/icon/phpmyadmin.png b/.../Core/config/software/icon/phpmyadmin.png → ...Files/config/software/icon/phpmyadmin.png
diff --git a/...arwin/Core/config/software/icon/redis.png → .../initFiles/config/software/icon/redis.png b/...arwin/Core/config/software/icon/redis.png → .../initFiles/config/software/icon/redis.png
diff --git a/...win/Core/config/software/icon/wwwstop.png → ...nitFiles/config/software/icon/wwwstop.png b/...win/Core/config/software/icon/wwwstop.png → ...nitFiles/config/software/icon/wwwstop.png