CB-8548 Fix keystore type detection (broken by 97718a0a25)

This commit is contained in:
Andrew Grieve 2015-04-07 20:36:13 -04:00
parent f2d7c49acf
commit b27d283f21

View File

@ -287,11 +287,13 @@ def addSigningProps(propsFilePath, signingConfig) {
signingConfig.keyPassword = props.get('keyPassword', props.get('key.alias.password', signingConfig.keyPassword))
signingConfig.storeFile = storeFile
signingConfig.storePassword = props.get('storePassword', props.get('key.store.password', signingConfig.storePassword))
def storeType = props.get('storeType', props.get('key.store.type', signingConfig.storeType))
def storeType = props.get('storeType', props.get('key.store.type', ''))
if (!storeType) {
def filename = storeFile.getName().toLowerCase();
if (filename.endsWith('.p12') || filename.endsWith('.pfx')) {
storeType = 'pkcs12'
} else {
storeType = signingConfig.storeType // "jks"
}
}
signingConfig.storeType = storeType