From 0f050f6e442d820a8da1799ea367677732a679f8 Mon Sep 17 00:00:00 2001
From: Gino Zhao <ginozhao2010@gmail.com>
Date: Thu, 11 May 2017 13:52:07 +0800
Subject: [PATCH] remove keeplive key from plist, update shell script adding
 launchctl start/stop command keeplive key  makes the services of
 shadowsocks-ng automatically start when logining system Replace the original
 way with launchctl start/stop, then start the services when needed as
 shadowsocks-ng using

---
 ShadowsocksX-NG/LaunchAgentUtils.swift | 3 ---
 ShadowsocksX-NG/start_kcptun.sh        | 1 +
 ShadowsocksX-NG/start_privoxy.sh       | 1 +
 ShadowsocksX-NG/start_ss_local.sh      | 3 ++-
 ShadowsocksX-NG/stop_kcptun.sh         | 1 +
 ShadowsocksX-NG/stop_privoxy.sh        | 3 +--
 ShadowsocksX-NG/stop_ss_local.sh       | 5 ++---
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift
index 9e7dfba..d74116d 100644
--- a/ShadowsocksX-NG/LaunchAgentUtils.swift
+++ b/ShadowsocksX-NG/LaunchAgentUtils.swift
@@ -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,
diff --git a/ShadowsocksX-NG/start_kcptun.sh b/ShadowsocksX-NG/start_kcptun.sh
index 580d40e..3ca2463 100755
--- a/ShadowsocksX-NG/start_kcptun.sh
+++ b/ShadowsocksX-NG/start_kcptun.sh
@@ -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
diff --git a/ShadowsocksX-NG/start_privoxy.sh b/ShadowsocksX-NG/start_privoxy.sh
index bedef6a..dbc7d7b 100755
--- a/ShadowsocksX-NG/start_privoxy.sh
+++ b/ShadowsocksX-NG/start_privoxy.sh
@@ -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
diff --git a/ShadowsocksX-NG/start_ss_local.sh b/ShadowsocksX-NG/start_ss_local.sh
index b4047d3..a59973e 100755
--- a/ShadowsocksX-NG/start_ss_local.sh
+++ b/ShadowsocksX-NG/start_ss_local.sh
@@ -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"
\ No newline at end of file
+launchctl load "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"
+launchctl start com.qiuyuzhou.shadowsocksX-NG.local
diff --git a/ShadowsocksX-NG/stop_kcptun.sh b/ShadowsocksX-NG/stop_kcptun.sh
index b192aea..68536fc 100755
--- a/ShadowsocksX-NG/stop_kcptun.sh
+++ b/ShadowsocksX-NG/stop_kcptun.sh
@@ -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"
diff --git a/ShadowsocksX-NG/stop_privoxy.sh b/ShadowsocksX-NG/stop_privoxy.sh
index 8cb6a2b..e3ebb94 100755
--- a/ShadowsocksX-NG/stop_privoxy.sh
+++ b/ShadowsocksX-NG/stop_privoxy.sh
@@ -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"
diff --git a/ShadowsocksX-NG/stop_ss_local.sh b/ShadowsocksX-NG/stop_ss_local.sh
index 5a6cf57..15d59b3 100755
--- a/ShadowsocksX-NG/stop_ss_local.sh
+++ b/ShadowsocksX-NG/stop_ss_local.sh
@@ -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"
\ No newline at end of file
+launchctl stop com.qiuyuzhou.shadowsocksX-NG.local
+launchctl unload "$HOME/Library/LaunchAgents/com.qiuyuzhou.shadowsocksX-NG.local.plist"