Merge branch 'develop' into issue-24

* develop: README 1.4.5 add error messages to env config fixes #26, also check for non app store variant of JPEGmini bundle id Conflicts: bin/imageOptim environment/base.json src/shell/methods.sh
JamieMason · Jun 19, 2013 · 953aca7 · 953aca7
2 parents 07d4201 + 62acdc8
commit 953aca7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/bin/imageOptim b/bin/imageOptim
@@ -24,7 +24,7 @@
 # SOFTWARE.
 
 # current version of ImageOptim-CLI from package.json
-version="1.4.4"
+version="1.4.5"
 
 undefinedRunMode="false"
 

diff --git a/environment/base.json b/environment/base.json
@@ -26,6 +26,7 @@
   "imageOptimNotInstalledMsg": "$imageOptimAppFileName is not installed (http://imageoptim.com)",
 
   "jpegMiniAppBundleId": "com.icvt.JPEGmini",
+  "jpegMiniAppRetailBundleId": "com.icvt.JPEGmini-retail",
   "jpegMiniAppFileName": "JPEGmini.app",
   "jpegMiniAppName": "JPEGmini",
   "jpegMiniFileTypes": ".*(jpg|jpeg)",

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "homepage": "https://github.com/JamieMason/ImageOptim-CLI",
   "bugs": "https://github.com/JamieMason/ImageOptim-CLI/issues",
   "main": "./imageOptim",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "repository": {
     "type": "git",
     "url": "git://github.com/JamieMason/ImageOptim-CLI.git"