From 033993c9d7bb240f6b6bd12574e268662b46e96d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 31 Jul 2012 19:47:27 -0700 Subject: [PATCH] Pasto --- CU2/handle-control-change.sh | 2 +- CU2/switch-to-dhcp.sh | 2 +- CU2/switch-to-dnscrypt.sh | 1 - DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m | 10 +++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CU2/handle-control-change.sh b/CU2/handle-control-change.sh index cec132f..51659a6 100755 --- a/CU2/handle-control-change.sh +++ b/CU2/handle-control-change.sh @@ -7,7 +7,7 @@ if [ -e "$DNSCRYPT_FILE" ]; then ./switch-to-dnscrypt-if-required.sh else ./stop-dnscrypt-proxy.sh - ./switch-to-dhcp-if-required-.sh + ./switch-to-dhcp-if-required.sh fi rm -f "${STATES_DIR}/updating" rm -f "${STATES_DIR}/update-request" diff --git a/CU2/switch-to-dhcp.sh b/CU2/switch-to-dhcp.sh index ed5cf2e..b5a1fec 100755 --- a/CU2/switch-to-dhcp.sh +++ b/CU2/switch-to-dhcp.sh @@ -3,4 +3,4 @@ . ./common.inc rm -f "$DNSCRYPT_FILE" -exec ./switch-to-dhcp-if-required.sh + diff --git a/CU2/switch-to-dnscrypt.sh b/CU2/switch-to-dnscrypt.sh index 88ba72f..d626832 100755 --- a/CU2/switch-to-dnscrypt.sh +++ b/CU2/switch-to-dnscrypt.sh @@ -3,4 +3,3 @@ . ./common.inc touch "$DNSCRYPT_FILE" -exec ./switch-to-dnscrypt-if-required.sh diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m b/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m index bce896f..48eb5d1 100644 --- a/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m +++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m @@ -116,7 +116,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; } [self updateLedStatus]; - NSString *currentResolvers = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh", nil]]; + NSString *currentResolvers = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./get-current-resolvers.sh | ./get-upstream-resolvers.sh", nil]]; _statusConfigurationMenuItem.title = stateDescription; _statusResolversMenuItem.title = currentResolvers; @@ -164,14 +164,14 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN; } - (BOOL) setDNSCryptOn { - NSString *fileName = [NSString stringWithFormat: kDNSCRYPT_CONTROL_DIR @"/dnscrypt"]; - [@"on" writeToFile: fileName atomically: NO encoding: NSUTF8StringEncoding error: nil]; + NSString *res = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./switch-to-dnscrypt.sh", nil]]; + NSLog(@"%@", res); return TRUE; } - (BOOL) setDNSCryptOff { - NSString *fileName = [NSString stringWithFormat: kDNSCRYPT_CONTROL_DIR @"/dnscrypt"]; - [[NSFileManager defaultManager] removeItemAtPath: fileName error: nil]; + NSString *res = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && ./switch-to-dhcp.sh", nil]]; + NSLog(@"%@", res); return TRUE; }