diff --git a/README.md b/README.md
index 7d7d82f..2478a23 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# ShadowsocksX-NG
-Current version is 1.6.0
+Current version is 1.6.1
[](https://travis-ci.org/shadowsocks/ShadowsocksX-NG)
@@ -63,8 +63,6 @@ so that you could configure your apps to use the SOCKS5 proxy manually.
## Contributing
-[](https://gitter.im/ShadowsocksX-NG/Lobby)
-
Contributions must be available on a separately named branch based on the latest version of the main branch `develop`.
ref: [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/)
diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index a90f763..0242691 100755
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -57,7 +57,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
if attrs[FileAttributeKey.ownerAccountName] as! String != NSUserName() {
//try fileMgr.setAttributes([FileAttributeKey.ownerAccountName: NSUserName()], ofItemAtPath: dirPath)
let bashFilePath = Bundle.main.path(forResource: "fix_dir_owner.sh", ofType: nil)!
- let script = "do shell script \"bash \(bashFilePath) \(NSUserName()) \" with administrator privileges"
+ let script = "do shell script \"bash \\\"(bashFilePath)\\\" \(NSUserName()) \" with administrator privileges"
if let appleScript = NSAppleScript(source: script) {
var err: NSDictionary? = nil
appleScript.executeAndReturnError(&err)
diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist
index 96dbd73..77049e2 100644
--- a/ShadowsocksX-NG/Info.plist
+++ b/ShadowsocksX-NG/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.6.0
+ 1.6.1
CFBundleSignature
????
CFBundleURLTypes
diff --git a/ShadowsocksX-NG/ProxyConfHelper.m b/ShadowsocksX-NG/ProxyConfHelper.m
index ba7f6f4..d81b947 100644
--- a/ShadowsocksX-NG/ProxyConfHelper.m
+++ b/ShadowsocksX-NG/ProxyConfHelper.m
@@ -51,12 +51,12 @@ GCDWebServer *webServer =nil;
NSString *helperPath = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], @"install_helper.sh"];
NSLog(@"run install script: %@", helperPath);
NSDictionary *error;
- NSString *script = [NSString stringWithFormat:@"do shell script \"bash %@\" with administrator privileges", helperPath];
+ NSString *script = [NSString stringWithFormat:@"do shell script \"/bin/bash \\\"%@\\\"\" with administrator privileges", helperPath];
NSAppleScript *appleScript = [[NSAppleScript new] initWithSource:script];
if ([appleScript executeAndReturnError:&error]) {
NSLog(@"installation success");
} else {
- NSLog(@"installation failure");
+ NSLog(@"installation failure: %@", error);
}
}
}
diff --git a/ShadowsocksX-NG/SWBQRCodeWindowController.m b/ShadowsocksX-NG/SWBQRCodeWindowController.m
index a11cf5b..20e0d4f 100644
--- a/ShadowsocksX-NG/SWBQRCodeWindowController.m
+++ b/ShadowsocksX-NG/SWBQRCodeWindowController.m
@@ -19,7 +19,7 @@
[super windowDidLoad];
// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
- [self setQRCode:self.qrCode withOverlayText:@"Shadowsocks-NG SIP002"];
+ [self setQRCode:self.qrCode withOverlayText:@"SIP002"];
}
- (void)setQRCode:(NSString*) qrCode withOverlayText: (NSString*) text {
@@ -35,14 +35,9 @@
};
NSMutableAttributedString* attrsText = [[NSMutableAttributedString alloc] initWithString: text
attributes: attrs];
- [attrsText setAttributes:@{
- NSForegroundColorAttributeName: [NSColor darkGrayColor],
- NSBackgroundColorAttributeName: [NSColor whiteColor],
- NSFontAttributeName: [NSFont fontWithName:@"Helvetica" size:(CGFloat)16],
- } range: NSMakeRange(0, 14)];
[image lockFocus];
- [attrsText drawAtPoint: NSMakePoint(45, 8)];
+ [attrsText drawAtPoint: NSMakePoint(100, 5)];
[image unlockFocus];
}
self.imageView.image = image;
@@ -108,9 +103,9 @@
- (void)flagsChanged:(NSEvent *)event {
NSUInteger modifiers = event.modifierFlags & NSDeviceIndependentModifierFlagsMask;
if (modifiers & NSAlternateKeyMask) {
- [self setQRCode:self.legacyQRCode withOverlayText:@"Shadowsocks-NG Legacy"];
+ [self setQRCode:self.legacyQRCode withOverlayText:@"Legacy"];
} else {
- [self setQRCode:self.qrCode withOverlayText:@"Shadowsocks-NG SIP002"];
+ [self setQRCode:self.qrCode withOverlayText:@"SIP002"];
}
}