Update
This commit is contained in:
parent
642ea36b80
commit
d6611b6057
|
@ -8,3 +8,4 @@ ClashX.app
|
||||||
**/xcuserdata/
|
**/xcuserdata/
|
||||||
.idea
|
.idea
|
||||||
*.pyc
|
*.pyc
|
||||||
|
ClashX/clash/
|
||||||
|
|
|
@ -839,7 +839,7 @@
|
||||||
CODE_SIGN_IDENTITY = "Developer ID Application";
|
CODE_SIGN_IDENTITY = "Developer ID Application";
|
||||||
CODE_SIGN_STYLE = Manual;
|
CODE_SIGN_STYLE = Manual;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 1.17.0;
|
CURRENT_PROJECT_VERSION = 1.17.1;
|
||||||
DEVELOPMENT_TEAM = MEWHFZ92DY;
|
DEVELOPMENT_TEAM = MEWHFZ92DY;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
FRAMEWORK_SEARCH_PATHS = (
|
FRAMEWORK_SEARCH_PATHS = (
|
||||||
|
@ -860,7 +860,7 @@
|
||||||
"$(PROJECT_DIR)/ClashX",
|
"$(PROJECT_DIR)/ClashX",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.12;
|
MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||||
MARKETING_VERSION = 1.17.0;
|
MARKETING_VERSION = 1.17.1;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.west2online.ClashX;
|
PRODUCT_BUNDLE_IDENTIFIER = com.west2online.ClashX;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
@ -879,7 +879,7 @@
|
||||||
CODE_SIGN_IDENTITY = "Developer ID Application";
|
CODE_SIGN_IDENTITY = "Developer ID Application";
|
||||||
CODE_SIGN_STYLE = Manual;
|
CODE_SIGN_STYLE = Manual;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 1.17.0;
|
CURRENT_PROJECT_VERSION = 1.17.1;
|
||||||
DEVELOPMENT_TEAM = MEWHFZ92DY;
|
DEVELOPMENT_TEAM = MEWHFZ92DY;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
FRAMEWORK_SEARCH_PATHS = (
|
FRAMEWORK_SEARCH_PATHS = (
|
||||||
|
@ -900,7 +900,7 @@
|
||||||
"$(PROJECT_DIR)/ClashX",
|
"$(PROJECT_DIR)/ClashX",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.12;
|
MACOSX_DEPLOYMENT_TARGET = 10.12;
|
||||||
MARKETING_VERSION = 1.17.0;
|
MARKETING_VERSION = 1.17.1;
|
||||||
OTHER_CODE_SIGN_FLAGS = "--timestamp";
|
OTHER_CODE_SIGN_FLAGS = "--timestamp";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.west2online.ClashX;
|
PRODUCT_BUNDLE_IDENTIFIER = com.west2online.ClashX;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
module github.com/yichengchen/clashX/ClashX
|
module github.com/yichengchen/clashX/ClashX
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/Dreamacro/clash v0.17.1-0.20191228144230-6ce7b6ef8357
|
github.com/Dreamacro/clash v0.17.1-0.20191231064700-50704eaeeb26
|
||||||
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
|
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
github.com/Dreamacro/clash v0.17.1-0.20191228144230-6ce7b6ef8357 h1:GS0u72OoK1tZqNFHpehs3WH6sagBhPdTNN9j1sW8Nq0=
|
github.com/Dreamacro/clash v0.17.1-0.20191231064700-50704eaeeb26 h1:lB8SJTI+D3RfUdTtdagfTlexKAbHo92bUu3GUFHt+Ao=
|
||||||
github.com/Dreamacro/clash v0.17.1-0.20191228144230-6ce7b6ef8357/go.mod h1:3AN6ikXSGG+ZHpQQMirTGu8t3tokzyLU/NUXb5QYZ9Q=
|
github.com/Dreamacro/clash v0.17.1-0.20191231064700-50704eaeeb26/go.mod h1:3AN6ikXSGG+ZHpQQMirTGu8t3tokzyLU/NUXb5QYZ9Q=
|
||||||
github.com/Dreamacro/go-shadowsocks2 v0.1.5 h1:BizWSjmwzAyQoslz6YhJYMiAGT99j9cnm9zlxVr+kyI=
|
github.com/Dreamacro/go-shadowsocks2 v0.1.5 h1:BizWSjmwzAyQoslz6YhJYMiAGT99j9cnm9zlxVr+kyI=
|
||||||
github.com/Dreamacro/go-shadowsocks2 v0.1.5/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
|
github.com/Dreamacro/go-shadowsocks2 v0.1.5/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
|
|
@ -5,11 +5,8 @@ rm -f ./ClashX/Resources/Country.mmdb
|
||||||
rm -rf ./ClashX/Resources/dashboard
|
rm -rf ./ClashX/Resources/dashboard
|
||||||
rm -f GeoLite2-Country.*
|
rm -f GeoLite2-Country.*
|
||||||
echo "install mmdb"
|
echo "install mmdb"
|
||||||
wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
|
wget https://static.clash.to/GeoIP2/GeoIP2-Country.mmdb
|
||||||
tar -zxvf GeoLite2-Country.tar.gz
|
mv GeoIP2-Country.mmdb ./ClashX/Resources/Country.mmdb
|
||||||
mv GeoLite2-Country_*/GeoLite2-Country.mmdb ./ClashX/Resources/Country.mmdb
|
|
||||||
rm GeoLite2-Country.tar.gz
|
|
||||||
rm -r GeoLite2-Country_*
|
|
||||||
echo "install dashboard"
|
echo "install dashboard"
|
||||||
cd ClashX/Resources
|
cd ClashX/Resources
|
||||||
git clone -b gh-pages https://github.com/Dreamacro/clash-dashboard.git dashboard
|
git clone -b gh-pages https://github.com/Dreamacro/clash-dashboard.git dashboard
|
||||||
|
|
Loading…
Reference in New Issue