merge fixes

karajanyp · Nov 19, 2014 · dde993e · dde993e
1 parent aa5deb5
commit dde993e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Example/KZBootstrap.xcodeproj/project.pbxproj b/Example/KZBootstrap.xcodeproj/project.pbxproj
@@ -622,7 +622,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"COCOAPODS=1",
-					"KZBDefaultEnv=\"$(KZBEnv)\"",
+					"KZBEnv=\"$(KZBEnv)\"",
 				);
 				INFOPLIST_FILE = "KZBootstrap/KZBootstrap-Info.plist";
 				KZBEnv = "@\\\"QA\\\"";
@@ -750,7 +750,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"COCOAPODS=1",
-					"KZBDefaultEnv=\"$(KZBEnv)\"",
+					"KZBEnv=\"$(KZBEnv)\"",
 				);
 				INFOPLIST_FILE = "KZBootstrap/KZBootstrap-Info.plist";
 				KZBEnv = "@\\\"QA\\\"";

diff --git a/KZBootstrap.podspec b/KZBootstrap.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "KZBootstrap"
-  s.version          = "0.5.2"
+  s.version          = "0.5.3"
   s.summary          = "iOS project bootstrap aimed at high quality coding."
   s.description      = <<-DESC
                        Project bootstrap that provides automatic icon versioning, todo -> warning conversion, warnings while files become too long, build numbering, environment switching/validation and much more.

diff --git a/Pod/Assets/Scripts/bootstrap.sh b/Pod/Assets/Scripts/bootstrap.sh
@@ -7,12 +7,12 @@ if [[ ! -d "${DIR}" ]]; then DIR="${PWD}"; fi
 . "${DIR}/todo.sh"
 . "${DIR}/user.sh"
 
-bundled_plist=$(find "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -name "KZBEnvironments.plist" | tr -d '\r')
-bundled_settings=$(find "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -name "Settings.bundle" | tr -d '\r')
+bundled_plist=$(find "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" -name "KZBEnvironments.plist" | tr -d '\r')
+bundled_settings=$(find "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" -name "Settings.bundle" | tr -d '\r')
 src_plist=$(find "${SRCROOT}" -name "KZBEnvironments.plist" | tr -d '\r')
 
 if [[ "${CONFIGURATION}" == *Release*  ]]; then
-  env -i xcrun -sdk macosx swift ${DIR}/processEnvironments.swift "${bundled_plist}" "${src_plist}" "${bundled_settings}" "PRODUCTION"
+  env -i xcrun -sdk macosx swift "${DIR}/processEnvironments.swift" "${bundled_plist}" "${src_plist}" "${bundled_settings}" "PRODUCTION"
 else
-  env -i xcrun -sdk macosx swift ${DIR}/processEnvironments.swift "${bundled_plist}" "${src_plist}" "${bundled_settings}"
+  env -i xcrun -sdk macosx swift "${DIR}/processEnvironments.swift" "${bundled_plist}" "${src_plist}" "${bundled_settings}"
 fi