Merge pull request #5595 from webmaster128/fix-shellscript

Fix shellscript in '📦 Check Pods Manifest.lock'

CHANGELOG.md

@@ -91,6 +91,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Daniel Tomlinson](https://github.com/dantoml)
   [#4014](https://github.com/CocoaPods/CocoaPods/issues/4014)
 
+* Update script '📦 Check Pods Manifest.lock': Write error message to STDERR; make POSIX compatible  
+  [Simon Warta](https://github.com/webmaster128)
+  [#5595](https://github.com/CocoaPods/CocoaPods/pull/5595)
+
 ## 1.0.1 (2016-06-02)
 
 ##### Enhancements

lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -175,10 +175,9 @@ module Pod
             native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
             phase.shell_script = <<-SH.strip_heredoc
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-              if [[ $? != 0 ]] ; then
-                  cat << EOM
-              error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
-              EOM
+              if [ $? != 0 ] ; then
+                  # print error to STDERR
+                  echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
                   exit 1
               fi
             SH

spec/unit/installer/user_project_integrator/target_integrator_spec.rb

@@ -96,10 +96,9 @@ module Pod
           phase = target.shell_script_build_phases.find { |bp| bp.name == phase_name }
           phase.shell_script.should == <<-EOS.strip_heredoc
           diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-          if [[ $? != 0 ]] ; then
-              cat << EOM
-          error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
-          EOM
+          if [ $? != 0 ] ; then
+              # print error to STDERR
+              echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
               exit 1
           fi
           EOS