xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Gong Zhang
2017-07-31 11:03:00 +08:00
committed by GitHub
parent 8423fa84b6 fb46501ff4
commit 44a368b7d5
8 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ShadowsocksX-NG/LaunchAgentUtils.swift
View File

@ -60,7 +60,6 @@ func generateSSLocalLauchAgentPlist() -> Bool {
let dict: NSMutableDictionary = [ let dict: NSMutableDictionary = [
"Label": "com.qiuyuzhou.shadowsocksX-NG.local", "Label": "com.qiuyuzhou.shadowsocksX-NG.local",
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR, "WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
"KeepAlive": true,
"StandardOutPath": logFilePath, "StandardOutPath": logFilePath,
"StandardErrorPath": logFilePath, "StandardErrorPath": logFilePath,
"ProgramArguments": arguments, "ProgramArguments": arguments,
@ -203,7 +202,6 @@ func generatePrivoxyLauchAgentPlist() -> Bool {
let dict: NSMutableDictionary = [ let dict: NSMutableDictionary = [
"Label": "com.qiuyuzhou.shadowsocksX-NG.http", "Label": "com.qiuyuzhou.shadowsocksX-NG.http",
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR, "WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
"KeepAlive": true,
"StandardOutPath": logFilePath, "StandardOutPath": logFilePath,
"StandardErrorPath": logFilePath, "StandardErrorPath": logFilePath,
"ProgramArguments": arguments "ProgramArguments": arguments
@ -358,7 +356,6 @@ func generateKcptunLauchAgentPlist() -> Bool {
let dict: NSMutableDictionary = [ let dict: NSMutableDictionary = [
"Label": "com.qiuyuzhou.shadowsocksX-NG.kcptun", "Label": "com.qiuyuzhou.shadowsocksX-NG.kcptun",
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR, "WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
"KeepAlive": true,
"StandardOutPath": logFilePath, "StandardOutPath": logFilePath,
"StandardErrorPath": logFilePath, "StandardErrorPath": logFilePath,
"ProgramArguments": arguments, "ProgramArguments": arguments,

3
ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift
View File

@ -68,5 +68,8 @@ class ProxyInterfacesViewCtrl: NSViewController, NSTableViewDataSource, NSTableV
} else { } else {
selectedNetworkServices.remove(key) selectedNetworkServices.remove(key)
} }
UserDefaults.standard.set(selectedNetworkServices.allObjects,
forKey: "Proxy4NetworkServices")
} }
} }

1
ShadowsocksX-NG/start_kcptun.sh
View File

@ -7,3 +7,4 @@
# Copyright © 2017年 qiuyuzhou. All rights reserved. # Copyright © 2017年 qiuyuzhou. All rights reserved.
launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.kcptun.plist" launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.kcptun.plist"
launchctl start com.qiuyuzhou.shadowsocksX-NG.kcptun

1
ShadowsocksX-NG/start_privoxy.sh
View File

@ -7,3 +7,4 @@
# Copyright © 2016年 zhfish. All rights reserved. # Copyright © 2016年 zhfish. All rights reserved.
launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.http.plist" launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.http.plist"
launchctl start com.qiuyuzhou.shadowsocksX-NG.http

3
ShadowsocksX-NG/start_ss_local.sh
View File

@ -6,4 +6,5 @@
# Created by 邱宇舟 on 16/6/6. # Created by 邱宇舟 on 16/6/6.
# Copyright © 2016年 qiuyuzhou. All rights reserved. # Copyright © 2016年 qiuyuzhou. All rights reserved.
launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist" launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"
launchctl start com.qiuyuzhou.shadowsocksX-NG.local

1
ShadowsocksX-NG/stop_kcptun.sh
View File

@ -6,4 +6,5 @@
# Created by 邱宇舟 on 2017/1/11. # Created by 邱宇舟 on 2017/1/11.
# Copyright © 2017年 qiuyuzhou. All rights reserved. # Copyright © 2017年 qiuyuzhou. All rights reserved.
launchctl stop com.qiuyuzhou.shadowsocksX-NG.kcptun
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.kcptun.plist" launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.kcptun.plist"

3
ShadowsocksX-NG/stop_privoxy.sh
View File

@ -6,6 +6,5 @@
# Created by 王晨 on 16/10/7. # Created by 王晨 on 16/10/7.
# Copyright © 2016年 zhfish. All rights reserved. # Copyright © 2016年 zhfish. All rights reserved.
launchctl stop com.qiuyuzhou.shadowsocksX-NG.http
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.http.plist" launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.http.plist"

5
ShadowsocksX-NG/stop_ss_local.sh
View File

@ -6,6 +6,5 @@
# Created by 邱宇舟 on 16/6/6. # Created by 邱宇舟 on 16/6/6.
# Copyright © 2016年 qiuyuzhou. All rights reserved. # Copyright © 2016年 qiuyuzhou. All rights reserved.
launchctl stop com.qiuyuzhou.shadowsocksX-NG.local
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"