diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index e5357c9..54f766c 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -8,7 +8,7 @@ import Foundation -let SS_LOCAL_VERSION = "2.4.6" +let SS_LOCAL_VERSION = "2.5.6" let PRIVOXY_VERSION = "3.0.26.static" let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/" let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/" @@ -114,7 +114,8 @@ func InstallSSLocal() { let homeDir = NSHomeDirectory() let appSupportDir = homeDir+APP_SUPPORT_DIR if !fileMgr.fileExists(atPath: appSupportDir + "ss-local-\(SS_LOCAL_VERSION)/ss-local") - || !fileMgr.fileExists(atPath: appSupportDir + "libcrypto.1.0.0.dylib") { + || !fileMgr.fileExists(atPath: appSupportDir + "libcrypto.1.0.0.dylib") + || !fileMgr.fileExists(atPath: appSupportDir + "libpcre.1.dylib") { let bundle = Bundle.main let installerPath = bundle.path(forResource: "install_ss_local.sh", ofType: nil) let task = Process.launchedProcess(launchPath: installerPath!, arguments: [""]) diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh index dc9cbaa..35ba0dd 100755 --- a/ShadowsocksX-NG/install_ss_local.sh +++ b/ShadowsocksX-NG/install_ss_local.sh @@ -8,11 +8,14 @@ cd `dirname "${BASH_SOURCE[0]}"` -mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.4.6" -cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.4.6/" +mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.5.6" +cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.5.6/" rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" -ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.4.6/ss-local" "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" +ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.5.6/ss-local" "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" cp -f libcrypto.1.0.0.dylib "$HOME/Library/Application Support/ShadowsocksX-NG/" +cp -f libpcre.1.dylib "$HOME/Library/Application Support/ShadowsocksX-NG/" +rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/libpcre.dylib" +ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/libpcre.1.dylib" "$HOME/Library/Application Support/ShadowsocksX-NG/libpcre.dylib" -echo done \ No newline at end of file +echo done diff --git a/ShadowsocksX-NG/libpcre.1.dylib b/ShadowsocksX-NG/libpcre.1.dylib new file mode 100644 index 0000000..eaba371 Binary files /dev/null and b/ShadowsocksX-NG/libpcre.1.dylib differ diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local index c254766..5b1067a 100755 Binary files a/ShadowsocksX-NG/ss-local and b/ShadowsocksX-NG/ss-local differ