From ffe6eb70344a535fd32706b6a1ba56970162a7eb Mon Sep 17 00:00:00 2001
From: zhongzengqiang <zhongzq@longjitech.com>
Date: Wed, 9 Feb 2022 22:10:26 +0800
Subject: [PATCH] fix reinstall issue

---
 README.md                                 | 2 +-
 ShadowsocksX-NG.xcodeproj/project.pbxproj | 4 ++--
 ShadowsocksX-NG/ProxyConfHelper.swift     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 221bdebb..6627cb67 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ShadowsocksX-NG-R
+# ShadowsocksX-NG
 
 [![Build Status](https://travis-ci.org/shadowsocksr/ShadowsocksX-NG.svg?branches=develop)](https://travis-ci.org/shadowsocksr/ShadowsocksX-NG)
 
diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj
index 3bdcce75..570af300 100644
--- a/ShadowsocksX-NG.xcodeproj/project.pbxproj
+++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj
@@ -868,7 +868,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.6.10;
+				MARKETING_VERSION = 1.6.11;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -901,7 +901,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.6.10;
+				MARKETING_VERSION = 1.6.11;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/ShadowsocksX-NG/ProxyConfHelper.swift b/ShadowsocksX-NG/ProxyConfHelper.swift
index 9d9862b2..5c39acf9 100644
--- a/ShadowsocksX-NG/ProxyConfHelper.swift
+++ b/ShadowsocksX-NG/ProxyConfHelper.swift
@@ -37,7 +37,7 @@ class ProxyConfHelper {
 
         var str: String?
         if let data = data {
-            str = String(data: data, encoding: .utf8)
+            str = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .newlines)
         }
 
         if str != kProxyConfHelperVersion {