Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-20 14:34:30 +00:00
Code Releases 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
ShadowsocksX-NG/LaunchAgentUtils.swift
-3
View File
@@ -60,7 +60,6 @@ func generateSSLocalLauchAgentPlist() -> Bool {
let dict: NSMutableDictionary = [
"Label": "com.qiuyuzhou.shadowsocksX-NG.local",
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
"KeepAlive": true,
"StandardOutPath": logFilePath,
"StandardErrorPath": logFilePath,
"ProgramArguments": arguments,
@@ -203,7 +202,6 @@ func generatePrivoxyLauchAgentPlist() -> Bool {
let dict: NSMutableDictionary = [
"Label": "com.qiuyuzhou.shadowsocksX-NG.http",
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
"KeepAlive": true,
"StandardOutPath": logFilePath,
"StandardErrorPath": logFilePath,
"ProgramArguments": arguments
@@ -358,7 +356,6 @@ func generateKcptunLauchAgentPlist() -> Bool {
let dict: NSMutableDictionary = [
"Label": "com.qiuyuzhou.shadowsocksX-NG.kcptun",
"WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR,
"KeepAlive": true,
"StandardOutPath": logFilePath,
"StandardErrorPath": logFilePath,
"ProgramArguments": arguments,
ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift
+3
View File
@@ -68,5 +68,8 @@ class ProxyInterfacesViewCtrl: NSViewController, NSTableViewDataSource, NSTableV
} else {
selectedNetworkServices.remove(key)
}
UserDefaults.standard.set(selectedNetworkServices.allObjects,
forKey: "Proxy4NetworkServices")
}
}
ShadowsocksX-NG/start_kcptun.sh
+1
View File
@@ -7,3 +7,4 @@
# Copyright © 2017年 qiuyuzhou. All rights reserved.
launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.kcptun.plist"
launchctl start com.qiuyuzhou.shadowsocksX-NG.kcptun
ShadowsocksX-NG/start_privoxy.sh
+1
View File
@@ -7,3 +7,4 @@
# Copyright © 2016年 zhfish. All rights reserved.
launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.http.plist"
launchctl start com.qiuyuzhou.shadowsocksX-NG.http
ShadowsocksX-NG/start_ss_local.sh
+2 -1
View File
@@ -6,4 +6,5 @@
# Created by 邱宇舟 on 16/6/6.
# 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
ShadowsocksX-NG/stop_kcptun.sh
+1
View File
@@ -6,4 +6,5 @@
# Created by 邱宇舟 on 2017/1/11.
# Copyright © 2017年 qiuyuzhou. All rights reserved.
launchctl stop com.qiuyuzhou.shadowsocksX-NG.kcptun
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.kcptun.plist"
ShadowsocksX-NG/stop_privoxy.sh
+1 -2
View File
@@ -6,6 +6,5 @@
# Created by 王晨 on 16/10/7.
# Copyright © 2016年 zhfish. All rights reserved.
launchctl stop com.qiuyuzhou.shadowsocksX-NG.http
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.http.plist"
ShadowsocksX-NG/stop_ss_local.sh
+2 -3
View File
@@ -6,6 +6,5 @@
# Created by 邱宇舟 on 16/6/6.
# Copyright © 2016年 qiuyuzhou. All rights reserved.
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"
launchctl stop com.qiuyuzhou.shadowsocksX-NG.local
launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"