Update the CFBundleVersion instead of attempting to add it.

eczarny · Oct 28, 2014 · d79b90c · d79b90c
1 parent 04ba593
commit d79b90c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Spectacle.xcodeproj/project.pbxproj b/Spectacle.xcodeproj/project.pbxproj
@@ -373,7 +373,7 @@
 				2D1E1AAC147E06AD0021D73D /* Sources */,
 				2D1E1AAD147E06AD0021D73D /* Frameworks */,
 				2D1E1AAE147E06AD0021D73D /* Resources */,
-				2DC25F9D19FF3F93009591A9 /* Add CFBundleVersion */,
+				2DC25F9D19FF3F93009591A9 /* Update CFBundleVersion */,
 				F1EA1F8459FB4A1D9574B6AD /* Copy Pods Resources */,
 			);
 			buildRules = (
@@ -442,19 +442,19 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2DC25F9D19FF3F93009591A9 /* Add CFBundleVersion */ = {
+		2DC25F9D19FF3F93009591A9 /* Update CFBundleVersion */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Add CFBundleVersion";
+			name = "Update CFBundleVersion";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# See: http://tgoode.com/2014/06/05/sensible-way-increment-bundle-version-cfbundleversion-xcode/\nbranch=${1:-'master'}\nbuild_number=$(expr $(git rev-list $branch --count) - $(git rev-list HEAD...$branch --count))\necho \"Updating build number to $build_number using branch: $branch\"\n/usr/libexec/PlistBuddy -c \"Add :CFBundleVersion string $build_number\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n";
+			shellScript = "# See: http://tgoode.com/2014/06/05/sensible-way-increment-bundle-version-cfbundleversion-xcode/\nbranch=${1:-'master'}\nbuild_number=$(expr $(git rev-list $branch --count) - $(git rev-list HEAD...$branch --count))\necho \"Updating build number to $build_number using branch: $branch\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $build_number\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n";
 		};
 		4333C7B808B243C29E3C2D58 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/Spectacle/Resources/Property Lists/Spectacle-Info.plist b/Spectacle/Resources/Property Lists/Spectacle-Info.plist
@@ -20,6 +20,8 @@
 	<string>0.8.6</string>
 	<key>CFBundleSignature</key>
 	<string>ZERO</string>
+	<key>CFBundleVersion</key>
+	<string></string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Spectacle/SpectacleWindowPositionCalculator.m b/Spectacle/SpectacleWindowPositionCalculator.m
@@ -142,7 +142,6 @@ + (CGRect)findThirdForWindowRect: (CGRect)windowRect visibleFrameOfScreen: (CGRe
     for (i = 0; i < thirds.count; i++) {
         CGRect currentWindowRect = [thirds[i] windowRect];
 
-        // are we within this "third" and centred within it? advance to next
         if (RectCentredWithinRect(currentWindowRect, windowRect)) {
             NSInteger j = i;