diff --git a/SCStringsUtility.xcodeproj/project.pbxproj b/SCStringsUtility.xcodeproj/project.pbxproj
index 7d11a18..558f6a1 100644
--- a/SCStringsUtility.xcodeproj/project.pbxproj
+++ b/SCStringsUtility.xcodeproj/project.pbxproj
@@ -244,7 +244,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = SC;
- LastUpgradeCheck = 0610;
+ LastUpgradeCheck = 0720;
ORGANIZATIONNAME = "Stefan Ceriu";
};
buildConfigurationList = 18D36745162772B500B6BACE /* Build configuration list for PBXProject "SCStringsUtility" */;
@@ -325,6 +325,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -377,6 +378,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "SCStringsUtility/SCStringsUtility-Prefix.pch";
INFOPLIST_FILE = "SCStringsUtility/SCStringsUtility-Info.plist";
+ PRODUCT_BUNDLE_IDENTIFIER = "com.stefanceriu.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = SCStringsUtility;
WRAPPER_EXTENSION = app;
};
@@ -395,6 +397,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "SCStringsUtility/SCStringsUtility-Prefix.pch";
INFOPLIST_FILE = "SCStringsUtility/SCStringsUtility-Info.plist";
+ PRODUCT_BUNDLE_IDENTIFIER = "com.stefanceriu.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = SCStringsUtility;
WRAPPER_EXTENSION = app;
};
diff --git a/SCStringsUtility/SCRootViewController.xib b/SCStringsUtility/SCRootViewController.xib
index 04edc5d..a3fca80 100644
--- a/SCStringsUtility/SCRootViewController.xib
+++ b/SCStringsUtility/SCRootViewController.xib
@@ -1,1223 +1,241 @@
-
-
-
- 1070
- 14B25
- 6254
- 1343.16
- 755.00
-
-
- NSBox
- NSButton
- NSButtonCell
- NSCustomObject
- NSCustomView
- NSOutlineView
- NSProgressIndicator
- NSScrollView
- NSScroller
- NSSearchField
- NSSearchFieldCell
- NSSplitView
- NSTableColumn
- NSTableHeaderView
- NSTableView
- NSTextFieldCell
- NSTextView
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
- view
-
-
-
- 2
-
-
-
- progressIndicator
-
-
-
- 392
-
-
-
- saveButton
-
-
-
- 560
-
-
-
- onSaveClick:
-
-
-
- 291
-
-
-
- onExportClick:
-
-
-
- 266
-
-
-
- exportButton
-
-
-
- 559
-
-
-
- textView
-
-
-
- 852
-
-
-
- tableView
-
-
-
- 154
-
-
-
- outlineView
-
-
-
- 821
-
-
-
- splitView
-
-
-
- 873
-
-
-
- searchField
-
-
-
- 929
-
-
-
- searchKeysOnlyCheckboxButton
-
-
-
- 935
-
-
-
- onSearchKeysOnlyCheckboxButtonValueChanged:
-
-
-
- 936
-
-
-
- onOpenClick:
-
-
-
- 940
-
-
-
- delegate
-
-
-
- 872
-
-
-
- delegate
-
-
-
- 930
-
-
-
-
-
- 0
-
-
-
-
-
- -2
-
-
- File's Owner
-
-
- -1
-
-
- First Responder
-
-
- -3
-
-
- Application
-
-
- 1
-
-
-
-
-
-
-
-
-
-
- 364
-
-
- Bottom progress view
-
-
- 460
-
-
-
-
-
-
-
-
- 801
-
-
-
-
-
-
-
-
-
- 802
-
-
-
-
-
-
-
- 805
-
-
-
-
-
-
-
- 806
-
-
-
-
- 803
-
-
-
-
- 804
-
-
-
-
- 836
-
-
-
-
-
-
-
-
- Top toolbar
-
-
- 844
-
-
-
-
-
-
-
- 845
-
-
-
-
-
-
-
-
-
- 848
-
-
-
-
- 847
-
-
-
-
- 846
-
-
-
-
- 256
-
-
-
-
-
- Export button
-
-
- 259
-
-
-
-
- 281
-
-
-
-
-
- Save button
-
-
- 283
-
-
-
-
- 70
-
-
-
-
-
- Open button
-
-
- 71
-
-
-
-
- 931
-
-
-
-
-
-
- Search Box
-
-
- 932
-
-
-
-
-
-
-
- 933
-
-
-
-
- 927
-
-
-
-
-
-
-
- 928
-
-
-
-
- 144
-
-
-
-
-
-
-
-
-
-
- 145
-
-
-
-
- 146
-
-
-
-
- 148
-
-
-
-
- 459
-
-
-
-
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
- 942
-
-
- 0
- IBCocoaFramework
- NO
-
- com.apple.InterfaceBuilder.CocoaPlugin.macosx
-
-
-
- com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3
-
-
- YES
- 3
-
- {15, 15}
- {128, 128}
- {128, 128}
- {128, 128}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SCStringsUtility/SCStringsController.m b/SCStringsUtility/SCStringsController.m
index babffb8..dbda073 100644
--- a/SCStringsUtility/SCStringsController.m
+++ b/SCStringsUtility/SCStringsController.m
@@ -244,13 +244,19 @@ -(void)executeGenStringsAtPath:(NSString*)path withRoutine:(NSString*)routine po
[task setLaunchPath: @"/bin/sh"];
[task setCurrentDirectoryPath:path];
- NSString *tempFilePath = NSTemporaryDirectory();
+ NSMutableString *argumentsString = [NSMutableString stringWithString:@"find ./ \\( -name *.m -o -name *.swift \\) -exec genstrings -a"];
- NSString *argument = [NSString stringWithFormat:@"find ./ -name *.m -print0 -o -name *.swift -print0 | xargs -0 genstrings -o %@", tempFilePath];
- if([routine length]) argument = [argument stringByAppendingString:[NSString stringWithFormat:@" -s %@", routine]];
- if(!positionalParameters) argument = [argument stringByAppendingString:@" -noPositionalParameters"];
+ if([routine length]) {
+ [argumentsString appendString:[NSString stringWithFormat:@" -s %@", routine]];
+ }
+
+ if(!positionalParameters) {
+ [argumentsString appendString:@" -noPositionalParameters"];
+ }
+
+ [argumentsString appendFormat:@" -o %@ {} \\;", NSTemporaryDirectory()];
- [task setArguments:@[@"-c", argument]];
+ [task setArguments:@[@"-c", argumentsString]];
NSPipe *pipe = [NSPipe pipe];
[task setStandardOutput: pipe];
diff --git a/SCStringsUtility/SCStringsUtility-Info.plist b/SCStringsUtility/SCStringsUtility-Info.plist
index 498a35c..adb0ceb 100644
--- a/SCStringsUtility/SCStringsUtility-Info.plist
+++ b/SCStringsUtility/SCStringsUtility-Info.plist
@@ -9,7 +9,7 @@
CFBundleIconFile
icon
CFBundleIdentifier
- com.stefanceriu.${PRODUCT_NAME:rfc1034identifier}
+ $(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleInfoDictionaryVersion
6.0
CFBundleName