Skip to content

Commit f1faeec

Browse files
author
zhongzengqiang
committed
Merge branch 'dev'
2 parents d37f672 + 17883ea commit f1faeec

25 files changed

+64
-77
lines changed

‎ShadowsocksX-NG-RRelease.entitlements

-8
This file was deleted.

‎ShadowsocksX-NG-R.entitlements ‎ShadowsocksX-NG.entitlements

File renamed without changes.

‎ShadowsocksX-NG.xcodeproj/project.pbxproj

+19-22
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,8 @@
144144
092A90F22625E0F1007CA9CA /* SWBApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SWBApplication.swift; sourceTree = "<group>"; };
145145
092A920B27A5761E009DEA17 /* ss-local */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "ss-local"; sourceTree = "<group>"; };
146146
0948A8CE26288D090060D4AA /* QRCodeUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeUtils.swift; sourceTree = "<group>"; };
147-
094A892626248C8300394747 /* ShadowsocksX-NG-RRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "ShadowsocksX-NG-RRelease.entitlements"; sourceTree = "<group>"; };
148147
094BFD4E2659F9D80055F263 /* proxy_conf_helper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = proxy_conf_helper.entitlements; sourceTree = "<group>"; };
149-
094BFD4F2659F9E90055F263 /* ShadowsocksX-NG-R.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "ShadowsocksX-NG-R.entitlements"; sourceTree = "<group>"; };
148+
094BFD4F2659F9E90055F263 /* ShadowsocksX-NG.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "ShadowsocksX-NG.entitlements"; sourceTree = "<group>"; };
150149
0958DA66264810E100AF66D5 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
151150
0984E979263AFDF400A79681 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SWBQRCodeWindowController.xib; sourceTree = "<group>"; };
152151
0984E97F263AFDF800A79681 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SWBQRCodeWindowController.strings"; sourceTree = "<group>"; };
@@ -159,7 +158,7 @@
159158
9B07EFA91D048E880052D9DF /* menu_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_icon.png; sourceTree = "<group>"; };
160159
9B07EFAA1D048E880052D9DF /* menu_icon_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_icon_disabled.png; sourceTree = "<group>"; };
161160
9B07EFAB1D048E880052D9DF /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
162-
9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG-R.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ShadowsocksX-NG-R.app"; sourceTree = BUILT_PRODUCTS_DIR; };
161+
9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ShadowsocksX-NG.app"; sourceTree = BUILT_PRODUCTS_DIR; };
163162
9B0BFFE81D0460A70040E62B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
164163
9B0BFFEA1D0460A70040E62B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
165164
9B0BFFED1D0460A70040E62B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -277,8 +276,7 @@
277276
9B0BFFDC1D0460A70040E62B = {
278277
isa = PBXGroup;
279278
children = (
280-
094BFD4F2659F9E90055F263 /* ShadowsocksX-NG-R.entitlements */,
281-
094A892626248C8300394747 /* ShadowsocksX-NG-RRelease.entitlements */,
279+
094BFD4F2659F9E90055F263 /* ShadowsocksX-NG.entitlements */,
282280
9B0BFFE71D0460A70040E62B /* ShadowsocksX-NG */,
283281
9B0BFFF71D0460A70040E62B /* ShadowsocksX-NGTests */,
284282
9B3FFF451D09CD3B0019A709 /* proxy_conf_helper */,
@@ -290,7 +288,7 @@
290288
9B0BFFE61D0460A70040E62B /* Products */ = {
291289
isa = PBXGroup;
292290
children = (
293-
9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG-R.app */,
291+
9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG.app */,
294292
9B0BFFF41D0460A70040E62B /* ShadowsocksX-NGTests.xctest */,
295293
9B3FFF441D09CD3B0019A709 /* proxy_conf_helper */,
296294
);
@@ -380,9 +378,9 @@
380378
/* End PBXGroup section */
381379

382380
/* Begin PBXNativeTarget section */
383-
9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG-R */ = {
381+
9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG */ = {
384382
isa = PBXNativeTarget;
385-
buildConfigurationList = 9B0B00081D0460A70040E62B /* Build configuration list for PBXNativeTarget "ShadowsocksX-NG-R" */;
383+
buildConfigurationList = 9B0B00081D0460A70040E62B /* Build configuration list for PBXNativeTarget "ShadowsocksX-NG" */;
386384
buildPhases = (
387385
9B0BFFE11D0460A70040E62B /* Sources */,
388386
9B0BFFE21D0460A70040E62B /* Frameworks */,
@@ -394,15 +392,15 @@
394392
dependencies = (
395393
9B3FFF531D09E2B30019A709 /* PBXTargetDependency */,
396394
);
397-
name = "ShadowsocksX-NG-R";
395+
name = "ShadowsocksX-NG";
398396
packageProductDependencies = (
399397
094A892E26248D4C00394747 /* LaunchAtLogin */,
400398
099C07ED26249E6300D6FD67 /* Alamofire */,
401399
0981DEC9268CCA7600A39589 /* Yams */,
402400
0970E1DD27A566CE006A7817 /* GCDWebServers */,
403401
);
404402
productName = "ShadowsocksX-NG";
405-
productReference = 9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG-R.app */;
403+
productReference = 9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG.app */;
406404
productType = "com.apple.product-type.application";
407405
};
408406
9B0BFFF31D0460A70040E62B /* ShadowsocksX-NGTests */ = {
@@ -455,7 +453,6 @@
455453
TargetAttributes = {
456454
9B0BFFE41D0460A70040E62B = {
457455
CreatedOnToolsVersion = 7.3.1;
458-
DevelopmentTeam = 766AV76B44;
459456
LastSwiftMigration = 1240;
460457
ProvisioningStyle = Automatic;
461458
};
@@ -495,7 +492,7 @@
495492
projectDirPath = "";
496493
projectRoot = "";
497494
targets = (
498-
9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG-R */,
495+
9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG */,
499496
9B0BFFF31D0460A70040E62B /* ShadowsocksX-NGTests */,
500497
9B3FFF431D09CD3B0019A709 /* proxy_conf_helper */,
501498
);
@@ -634,7 +631,7 @@
634631
/* Begin PBXTargetDependency section */
635632
9B0BFFF61D0460A70040E62B /* PBXTargetDependency */ = {
636633
isa = PBXTargetDependency;
637-
target = 9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG-R */;
634+
target = 9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG */;
638635
targetProxy = 9B0BFFF51D0460A70040E62B /* PBXContainerItemProxy */;
639636
};
640637
9B3FFF531D09E2B30019A709 /* PBXTargetDependency */ = {
@@ -853,7 +850,7 @@
853850
buildSettings = {
854851
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
855852
CLANG_ENABLE_MODULES = YES;
856-
CODE_SIGN_ENTITLEMENTS = "ShadowsocksX-NG-R.entitlements";
853+
CODE_SIGN_ENTITLEMENTS = "ShadowsocksX-NG.entitlements";
857854
CODE_SIGN_IDENTITY = "Apple Development";
858855
COMBINE_HIDPI_IMAGES = YES;
859856
DEVELOPMENT_TEAM = 766AV76B44;
@@ -871,9 +868,9 @@
871868
"$(PROJECT_DIR)",
872869
);
873870
MACOSX_DEPLOYMENT_TARGET = 10.15;
874-
MARKETING_VERSION = 1.6.8;
871+
MARKETING_VERSION = 1.6.10;
875872
ONLY_ACTIVE_ARCH = YES;
876-
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG-R";
873+
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
877874
PRODUCT_NAME = "$(TARGET_NAME)";
878875
SWIFT_OBJC_BRIDGING_HEADER = "";
879876
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -886,7 +883,7 @@
886883
buildSettings = {
887884
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
888885
CLANG_ENABLE_MODULES = YES;
889-
CODE_SIGN_ENTITLEMENTS = "ShadowsocksX-NG-RRelease.entitlements";
886+
CODE_SIGN_ENTITLEMENTS = "ShadowsocksX-NG.entitlements";
890887
CODE_SIGN_IDENTITY = "Apple Development";
891888
COMBINE_HIDPI_IMAGES = YES;
892889
DEVELOPMENT_TEAM = 766AV76B44;
@@ -904,9 +901,9 @@
904901
"$(PROJECT_DIR)",
905902
);
906903
MACOSX_DEPLOYMENT_TARGET = 10.15;
907-
MARKETING_VERSION = 1.6.8;
904+
MARKETING_VERSION = 1.6.10;
908905
ONLY_ACTIVE_ARCH = NO;
909-
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG-R";
906+
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
910907
PRODUCT_NAME = "$(TARGET_NAME)";
911908
SWIFT_OBJC_BRIDGING_HEADER = "";
912909
SWIFT_VERSION = 5.0;
@@ -931,7 +928,7 @@
931928
PRODUCT_NAME = "$(TARGET_NAME)";
932929
PROVISIONING_PROFILE_SPECIFIER = "";
933930
SWIFT_VERSION = 5.0;
934-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG-R.app/Contents/MacOS/ShadowsocksX-NG-R";
931+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG";
935932
};
936933
name = Debug;
937934
};
@@ -953,7 +950,7 @@
953950
PRODUCT_NAME = "$(TARGET_NAME)";
954951
PROVISIONING_PROFILE_SPECIFIER = "";
955952
SWIFT_VERSION = 5.0;
956-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG-R.app/Contents/MacOS/ShadowsocksX-NG-R";
953+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG";
957954
};
958955
name = Release;
959956
};
@@ -1003,7 +1000,7 @@
10031000
/* End XCBuildConfiguration section */
10041001

10051002
/* Begin XCConfigurationList section */
1006-
9B0B00081D0460A70040E62B /* Build configuration list for PBXNativeTarget "ShadowsocksX-NG-R" */ = {
1003+
9B0B00081D0460A70040E62B /* Build configuration list for PBXNativeTarget "ShadowsocksX-NG" */ = {
10071004
isa = XCConfigurationList;
10081005
buildConfigurations = (
10091006
9B0B00091D0460A70040E62B /* Debug */,

‎ShadowsocksX-NG.xcodeproj/xcshareddata/xcschemes/ShadowsocksX-NG.xcscheme

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
BuildableIdentifier = "primary"
8787
BlueprintIdentifier = "9B0BFFE41D0460A70040E62B"
8888
BuildableName = "ShadowsocksX-NG-R.app"
89-
BlueprintName = "ShadowsocksX-NG-R"
89+
BlueprintName = "ShadowsocksX-NG"
9090
ReferencedContainer = "container:ShadowsocksX-NG.xcodeproj">
9191
</BuildableReference>
9292
</BuildActionEntry>
@@ -102,7 +102,7 @@
102102
BuildableIdentifier = "primary"
103103
BlueprintIdentifier = "9B0BFFE41D0460A70040E62B"
104104
BuildableName = "ShadowsocksX-NG-R.app"
105-
BlueprintName = "ShadowsocksX-NG-R"
105+
BlueprintName = "ShadowsocksX-NG"
106106
ReferencedContainer = "container:ShadowsocksX-NG.xcodeproj">
107107
</BuildableReference>
108108
</MacroExpansion>
@@ -135,7 +135,7 @@
135135
BuildableIdentifier = "primary"
136136
BlueprintIdentifier = "9B0BFFE41D0460A70040E62B"
137137
BuildableName = "ShadowsocksX-NG-R.app"
138-
BlueprintName = "ShadowsocksX-NG-R"
138+
BlueprintName = "ShadowsocksX-NG"
139139
ReferencedContainer = "container:ShadowsocksX-NG.xcodeproj">
140140
</BuildableReference>
141141
</BuildableProductRunnable>
@@ -152,7 +152,7 @@
152152
BuildableIdentifier = "primary"
153153
BlueprintIdentifier = "9B0BFFE41D0460A70040E62B"
154154
BuildableName = "ShadowsocksX-NG-R.app"
155-
BlueprintName = "ShadowsocksX-NG-R"
155+
BlueprintName = "ShadowsocksX-NG"
156156
ReferencedContainer = "container:ShadowsocksX-NG.xcodeproj">
157157
</BuildableReference>
158158
</BuildableProductRunnable>

‎ShadowsocksX-NG/AppDelegate.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
507507
}
508508

509509
@IBAction func feedback(_ sender: NSMenuItem) {
510-
NSWorkspace.shared.open(URL(string: "https://github.com/jack80342/ShadowsocksX-NG-R/issues")!)
510+
NSWorkspace.shared.open(URL(string: "https://github.com/jack80342/ShadowsocksX-NG/issues")!)
511511
}
512512

513513
@IBAction func checkForUpdate(_ sender: NSMenuItem) {
@@ -756,7 +756,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
756756
let alertResult = versionChecker.showAlertView(Title: newVersion["Title"] as! String, SubTitle: newVersion["SubTitle"] as! String, ConfirmBtn: newVersion["ConfirmBtn"] as! String, CancelBtn: newVersion["CancelBtn"] as! String)
757757
print(alertResult)
758758
if (newVersion["newVersion"] as! Bool && alertResult == 1000) {
759-
NSWorkspace.shared.open(URL(string: "https://github.com/jack80342/ShadowsocksX-NG-R/releases")!)
759+
NSWorkspace.shared.open(URL(string: "https://github.com/jack80342/ShadowsocksX-NG/releases")!)
760760
}
761761
}
762762
}

‎ShadowsocksX-NG/IconUtils.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// IconUtils.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/5/4.
66
//

‎ShadowsocksX-NG/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>zh_CN</string>
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIconFile</key>

‎ShadowsocksX-NG/LaunchAgentUtils.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import Foundation
1010

1111
let SS_LOCAL_VERSION = "3.3.5_4.static"
1212
let PRIVOXY_VERSION = "3.0.32.static"
13-
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG-R/"
13+
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
1414
let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"
15-
let LAUNCH_AGENT_CONF_SSLOCAL_NAME = "com.qiuyuzhou.shadowsocksX-NG-R.local.plist"
16-
let LAUNCH_AGENT_CONF_PRIVOXY_NAME = "com.qiuyuzhou.shadowsocksX-NG-R.http.plist"
15+
let LAUNCH_AGENT_CONF_SSLOCAL_NAME = "com.qiuyuzhou.shadowsocksX-NG.local.plist"
16+
let LAUNCH_AGENT_CONF_PRIVOXY_NAME = "com.qiuyuzhou.shadowsocksX-NG.http.plist"
1717

1818

1919
func getFileSHA1Sum(_ filepath: String) -> String {
@@ -64,7 +64,7 @@ func generateSSLocalLauchAgentPlist() -> Bool {
6464

6565
// For a complete listing of the keys, see the launchd.plist manual page.
6666
let dict: NSMutableDictionary = [
67-
"Label": "com.qiuyuzhou.shadowsocksX-NG-R.local",
67+
"Label": "com.qiuyuzhou.shadowsocksX-NG.local",
6868
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
6969
"KeepAlive": true,
7070
"StandardOutPath": logFilePath,
@@ -205,7 +205,7 @@ func generatePrivoxyLauchAgentPlist() -> Bool {
205205

206206
// For a complete listing of the keys, see the launchd.plist manual page.
207207
let dict: NSMutableDictionary = [
208-
"Label": "com.qiuyuzhou.shadowsocksX-NG-R.http",
208+
"Label": "com.qiuyuzhou.shadowsocksX-NG.http",
209209
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
210210
"KeepAlive": true,
211211
"StandardOutPath": logFilePath,

‎ShadowsocksX-NG/ProxyConfHelper.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ProxyConfHelper.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/4/20.
66
//
@@ -10,7 +10,7 @@ import GCDWebServers
1010

1111
class ProxyConfHelper {
1212

13-
let kShadowsocksHelper = "/Library/Application Support/ShadowsocksX-NG-R/proxy_conf_helper"
13+
let kShadowsocksHelper = "/Library/Application Support/ShadowsocksX-NG/proxy_conf_helper"
1414

1515
var webServer: GCDWebServer? = nil
1616

‎ShadowsocksX-NG/ProxyConfHelperVersion.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ProxyConfHelperVersion.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/4/20.
66
//

‎ShadowsocksX-NG/ProxyConfTool.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// ProxyConfTool.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/4/24.
66
//

‎ShadowsocksX-NG/QRCodeUtils.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// QRCodeUtils.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/4/15.
66
//

‎ShadowsocksX-NG/SWBApplication.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// SWBApplication.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/4/13.
66
//

‎ShadowsocksX-NG/SWBQRCodeWindowController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// SWBQRCodeWindowController.swift
3-
// ShadowsocksX-NG-R
3+
// ShadowsocksX-NG
44
//
55
// Created by 钟增强 on 2021/4/28.
66
//

‎ShadowsocksX-NG/Subscribe.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Subscribe: NSObject {
9797
fileprivate func sendRequest(url: String, options: Any, callback: @escaping (String, String) -> Void) {
9898
let headers: HTTPHeaders = [
9999
"token": self.token,
100-
"User-Agent": "ShadowsocksX-NG-R " + (getLocalInfo()["CFBundleShortVersionString"] as! String)
100+
"User-Agent": "ShadowsocksX-NG " + (getLocalInfo()["CFBundleShortVersionString"] as! String)
101101
]
102102

103103
AF.request(url, headers: headers)

‎ShadowsocksX-NG/VersionChecker.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import Cocoa
1010
import Alamofire
1111

12-
let LATEST_RELEASE_URL = "https://api.github.com/repos/jack80342/ShadowsocksX-NG-R/releases/latest"
12+
let LATEST_RELEASE_URL = "https://api.github.com/repos/jack80342/ShadowsocksX-NG/releases/latest"
1313
let _VERSION_XML_LOCAL: String = Bundle.main.bundlePath + "/Contents/Info.plist"
1414

1515
class VersionChecker: NSObject {

‎ShadowsocksX-NG/install_helper.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# Created by clowwindy on 14-3-15.
77

88
cd `dirname "${BASH_SOURCE[0]}"`
9-
sudo mkdir -p "/Library/Application Support/ShadowsocksX-NG-R/"
10-
sudo cp proxy_conf_helper "/Library/Application Support/ShadowsocksX-NG-R/"
11-
sudo chown root:admin "/Library/Application Support/ShadowsocksX-NG-R/proxy_conf_helper"
12-
sudo chmod +s "/Library/Application Support/ShadowsocksX-NG-R/proxy_conf_helper"
9+
sudo mkdir -p "/Library/Application Support/ShadowsocksX-NG/"
10+
sudo cp proxy_conf_helper "/Library/Application Support/ShadowsocksX-NG/"
11+
sudo chown root:admin "/Library/Application Support/ShadowsocksX-NG/proxy_conf_helper"
12+
sudo chmod +s "/Library/Application Support/ShadowsocksX-NG/proxy_conf_helper"
1313

1414
echo done

‎ShadowsocksX-NG/install_privoxy.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
cd `dirname "${BASH_SOURCE[0]}"`
1111
privoxyVersion=3.0.32.static
12-
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG-R/privoxy-$privoxyVersion"
13-
cp -f privoxy "$HOME/Library/Application Support/ShadowsocksX-NG-R/privoxy-$privoxyVersion/"
14-
rm -f "$HOME/Library/Application Support/ShadowsocksX-NG-R/privoxy"
15-
ln -s "$HOME/Library/Application Support/ShadowsocksX-NG-R/privoxy-$privoxyVersion/privoxy" "$HOME/Library/Application Support/ShadowsocksX-NG-R/privoxy"
12+
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion"
13+
cp -f privoxy "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion/"
14+
rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy"
15+
ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion/privoxy" "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy"
1616

1717
echo done

‎ShadowsocksX-NG/install_ss_local.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
cd `dirname "${BASH_SOURCE[0]}"`
1111
ssLocalVersion=3.3.5_4.static
12-
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG-R/ss-local-$ssLocalVersion"
13-
cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG-R/ss-local-$ssLocalVersion/"
14-
rm -f "$HOME/Library/Application Support/ShadowsocksX-NG-R/ss-local"
15-
ln -s "$HOME/Library/Application Support/ShadowsocksX-NG-R/ss-local-$ssLocalVersion/ss-local" "$HOME/Library/Application Support/ShadowsocksX-NG-R/ss-local"
12+
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion"
13+
cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/"
14+
rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local"
15+
ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/ss-local" "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local"
1616

17-
cp -f libcrypto.1.0.0.dylib "$HOME/Library/Application Support/ShadowsocksX-NG-R/"
17+
cp -f libcrypto.1.0.0.dylib "$HOME/Library/Application Support/ShadowsocksX-NG/"
1818

1919
echo done

0 commit comments

Comments
 (0)