fixed typos and simplified conditions

README.md

@@ -67,7 +67,7 @@ Parameters:
 The task unpacks `rcpArtifact` into a temporary directory, unpacks
 the JDK given by `jdkDependency`/`jdk` under the `jre` subdirectory of
 the unpacked RCP artifact, fixes file permissions and creates missing
-symlinks. If the additional properties for code singing (`signKeyChain`, `signKeyChainPassword`, `signIdentity`) are defined,
+symlinks. If the additional properties for code signing (`signKeyChain`, `signKeyChainPassword`, `signIdentity`) are defined,
 the application will be signed with the given certificate. Afterwards a DMG image is created and its layout is configured using the
 background image. Finally, the DMG is copied to `dmgFile`.
 

src/main/groovy/de/itemis/mps/gradle/CreateDmg.groovy

@@ -73,18 +73,18 @@ class CreateDmg extends DefaultTask {
                             'Mac/Finder/DSStore/BuddyAllocator.pm', 'Mac/Finder/DSStore.pm']
         File scriptsDir = File.createTempDir()
         File dmgDir = File.createTempDir()
-        def getSigningInfo = [signKeyChainPassword, signKeyChain, signIdentity]
+        def signingInfo = [signKeyChainPassword, signKeyChain, signIdentity]
         try {
             BundledScripts.extractScriptsToDir(scriptsDir, scripts)
             project.exec {
                 executable new File(scriptsDir, 'mpssign.sh')
 
-                if(getSigningInfo.every {el -> el != null}) {
+                if(signingInfo.every {it != null}) {
                     args '-r', rcpArtifact, '-o', dmgDir, '-j', jdk, '-p', signKeyChainPassword, '-k', signKeyChain, '-i', signIdentity
-                }else if (getSigningInfo.every {el -> el == null}){
+                }else if (signingInfo.every {it == null}){
                     args '-r', rcpArtifact, '-o', dmgDir, '-j', jdk
                 }else{
-                    throw new IllegalArgumentException("Not all signing paramters set:  signKeyChainPassword: ${getSigningInfo[0]}, signKeyChain: ${getSigningInfo[1]}, signIdentity: ${getSigningInfo[2]} ")
+                    throw new IllegalArgumentException("Not all signing paramters set.  signKeyChain: ${getSigningInfo[1]}, signIdentity: ${getSigningInfo[2]} and signKeyChainPassword needs to be set. ")
                 }
                 workingDir scriptsDir
             }

src/main/resources/de/itemis/mps/gradle/mpssign.sh

@@ -25,7 +25,7 @@ do
     i) SIGN_IDENTITY="$OPTARG";;
     h) echo "$USAGE" 
        exit 0;;
-    \?) echo "illegal option: -$OPTARG usage: /.mpssing.sh -r <rcp_file> -o <output_dir> [-j <jdk_file>] [-p <password keychain> -k <keychain> -i <sign identity>]" >&2
+    \?) echo "illegal option: -$OPTARG usage: $0 -r <rcp_file> -o <output_dir> [-j <jdk_file>] [-p <password keychain> -k <keychain> -i <sign identity>]" >&2
         exit 1;;
     :) echo "option: -$OPTARG requires an argument" >&2
        exit 1;;