From 4849df0d88589a63a0d446b397dfbad2d2ed6b95 Mon Sep 17 00:00:00 2001 From: Ricardo Gomes Date: Wed, 11 Sep 2019 09:28:53 +0100 Subject: [PATCH] Fix for the token read not reading more than 1024 chars. Version increment. --- Program.cs | 10 ++++++---- Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Program.cs b/Program.cs index 5e77c05..91ea3f5 100644 --- a/Program.cs +++ b/Program.cs @@ -168,19 +168,21 @@ static void Main(string[] args) } Enum.TryParse(selected, out InstallerOptions opt); Directory.CreateDirectory(rootFolder); + + var token = args.Length > 1 && enableRegistrationTokenRequest ? args[1] : ""; + if (enableRegistrationTokenRequest && (opt == InstallerOptions.Gatekeeper || opt == InstallerOptions.BeameSDK)) + token = requestRegistrationToken(token); + SetupProxy(); var env = SetupEnvVariables(); var result = false; - var token = args.Length > 1 && enableRegistrationTokenRequest ? args[1] : ""; switch(opt) { case InstallerOptions.Gatekeeper: - if (enableRegistrationTokenRequest) token = requestRegistrationToken(token); result = (disableInstallDependencies || InstallDeps(env)) && InstallBeameGateKeeper(token, env); break; case InstallerOptions.BeameSDK: - if (enableRegistrationTokenRequest) token = requestRegistrationToken(token); result = (disableInstallDependencies || InstallDeps(env)) && InstallBeameSDK(token, env); break; @@ -239,7 +241,7 @@ private static string requestRegistrationToken(string token) while (string.IsNullOrWhiteSpace(token)) { // extend readline size - Console.SetIn(new StreamReader(Console.OpenStandardInput(2048))); + Console.SetIn(new StreamReader(Console.OpenStandardInput(2048), Console.InputEncoding, false, 2048)); Console.WriteLine(); Console.WriteLine("Please enter registration token:"); diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 5d78a5a..3e5f40f 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.4.0")] -[assembly: AssemblyFileVersion("1.3.4.0")] +[assembly: AssemblyVersion("1.3.5.0")] +[assembly: AssemblyFileVersion("1.3.5.0")]