Merge branch 'develop' of github.com:JamieMason/ImageOptim-CLI into d…

…evelop

* 'develop' of github.com:JamieMason/ImageOptim-CLI:
  1.6.14
  fixes #26 regression
  Now the project uses lossy tools as well as just ImageOptim, update wording
  Update README.md

README.md

@@ -1,14 +1,14 @@
 # ImageOptim-CLI
 
-Automates batch image processing with [ImageOptim](http://imageoptim.com), [ImageAlpha](http://pngmini.com), and [JPEGmini for Mac](http://jpegmini.com/mac) to make lossless optimisation of images part of your automated build process.
+Automates [ImageOptim](http://imageoptim.com), [ImageAlpha](http://pngmini.com), and [JPEGmini for Mac](http://jpegmini.com/mac) to make batch optimisation of images part of your automated build process.
 
 ## Installation
 
     $ npm install -g imageoptim-cli
 
 ImageOptim-CLI is written in Shell and AppleScript, so you don't _need_ Node.js or npm. You can install manually by downloading the latest zip then adding ImageOptim-CLI to your [$PATH](https://en.wikipedia.org/wiki/PATH_\(variable\)).
 
-	$ curl --output imageoptim-cli.zip https://codeload.github.com/JamieMason/ImageOptim-CLI/zip/1.6.13
+	$ curl --output imageoptim-cli.zip https://codeload.github.com/JamieMason/ImageOptim-CLI/zip/1.6.14
 	$ unzip imageoptim-cli.zip
 	$ export PATH=$PATH:imageoptim-cli/bin
 

bin/imageOptim

@@ -24,7 +24,7 @@
 # SOFTWARE.
 
 # current version of ImageOptim-CLI from package.json
-version="1.6.13"
+version="1.6.14"
 
 # to be set to "stdin" or "directory" based on cli options or piped input
 runMode="stdin"
@@ -61,6 +61,7 @@ imageOptimAppFileName="ImageOptim.app"
 # JPEGmini
 jpegMiniFileTypes=".*(jpg|jpeg)"
 jpegMiniAppBundleId="com.icvt.JPEGmini"
+jpegMiniAppRetailBundleId="com.icvt.JPEGmini-retail"
 jpegMiniAppName="JPEGmini"
 jpegMiniAppFileName="JPEGmini.app"
 

package.json

@@ -1,11 +1,11 @@
 {
   "name": "imageoptim-cli",
   "author": "Jamie Mason (https://github.com/JamieMason)",
-  "description": "Automates batch image processing with ImageOptim, ImageAlpha, and JPEGmini for Mac to make lossless optimisation of images part of your automated build process.",
+  "description": "Automates ImageOptim, ImageAlpha, and JPEGmini for Mac to make batch optimisation of images part of your automated build process.",
   "homepage": "https://github.com/JamieMason/ImageOptim-CLI",
   "bugs": "https://github.com/JamieMason/ImageOptim-CLI/issues",
   "main": "./imageOptim",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "repository": {
     "type": "git",
     "url": "git://github.com/JamieMason/ImageOptim-CLI.git"

src/md/README.md

@@ -1,6 +1,6 @@
 # ImageOptim-CLI
 
-Automates batch image processing with [ImageOptim](http://imageoptim.com), [ImageAlpha](http://pngmini.com), and [JPEGmini for Mac](http://jpegmini.com/mac) to make lossless optimisation of images part of your automated build process.
+Automates [ImageOptim](http://imageoptim.com), [ImageAlpha](http://pngmini.com), and [JPEGmini for Mac](http://jpegmini.com/mac) to make batch optimisation of images part of your automated build process.
 
 ## Installation
 

src/shell/variables.sh

@@ -36,5 +36,6 @@ imageOptimAppFileName="{{imageOptimAppFileName}}"
 # JPEGmini
 jpegMiniFileTypes="{{jpegMiniFileTypes}}"
 jpegMiniAppBundleId="{{jpegMiniAppBundleId}}"
+jpegMiniAppRetailBundleId="{{jpegMiniAppRetailBundleId}}"
 jpegMiniAppName="{{jpegMiniAppName}}"
 jpegMiniAppFileName="{{jpegMiniAppFileName}}"