Commit 41063f37 authored by Robin Fischer's avatar Robin Fischer

Fix android password handling

parent 924184b3
......@@ -53,12 +53,14 @@ module Fastlane
end
end
unless params[:android_signing_key_store].nil? || params[:android_signing_key_alias].nil?
# Convert hexadecimal key back to binary
key_restore_command = "tr -cd 0-9a-fA-F < #{params[:android_signing_key_store]} | xxd -r -p > #{params[:android_signing_key_store]}.binary"
FastlaneCore::CommandExecutor.execute(command: key_restore_command, print_all: true, print_command: true)
command << " /p:AndroidKeyStore=#{params[:android_sign_with_key_store]}"
command << " /p:AndroidSigningKeyStore=#{params[:android_signing_key_store]}"
command << " /p:AndroidSigningStorePass=$([MSBuild]::Escape('#{params[:android_signing_store_password]}'))"
command << " /p:KeyPass=$([MSBuild]::Escape('#{params[:android_signing_store_password]}'))"
command << " /p:AndroidSigningKeyStore=#{params[:android_signing_key_store]}.binary"
command << " /p:AndroidSigningStorePass=env:#{params[:android_signing_store_password_env]}"
command << " /p:AndroidSigningKeyAlias=#{params[:android_signing_key_alias]}"
command << " /p:AndroidSigningKeyPass=$([MSBuild]::Escape('#{params[:android_signing_key_password]}'))"
command << " /p:AndroidSigningKeyPass=env:#{params[:android_signing_key_password_env]}"
end
end
......@@ -169,10 +171,10 @@ module Fastlane
),
FastlaneCore::ConfigItem.new(
key: :android_signing_store_password,
key: :android_signing_store_password_env,
optional: true,
env_name: 'FL_MSBUILD_ANDROID_SIGNING_STORE_PASSWORD',
description: "AndroidSigningStorePass",
env_name: 'FL_MSBUILD_ANDROID_SIGNING_STORE_PASSWORD_ENV',
description: "AndroidSigningStorePass Environment Variable Name",
type: String,
),
......@@ -185,10 +187,10 @@ module Fastlane
),
FastlaneCore::ConfigItem.new(
key: :android_signing_key_password,
key: :android_signing_key_password_env,
optional: true,
env_name: 'FL_MSBUILD_ANDROID_SIGNING_KEY_PASSWORD',
description: "AndroidSigningKeyPass",
env_name: 'FL_MSBUILD_ANDROID_SIGNING_KEY_PASSWORD_ENV',
description: "AndroidSigningKeyPass Environment Variable Name",
type: String,
),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment