From e2a2f2c2884defcf167cc71ab78563bebcdb552f Mon Sep 17 00:00:00 2001 From: Opportunity Date: Fri, 12 Jun 2020 12:53:26 +0800 Subject: [PATCH] commiter message --- EhTagClient/Consts.cs | 13 +++++++++++-- EhTagClient/RepoClient.cs | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/EhTagClient/Consts.cs b/EhTagClient/Consts.cs index 55cff13..885284e 100644 --- a/EhTagClient/Consts.cs +++ b/EhTagClient/Consts.cs @@ -13,9 +13,12 @@ public static class Consts public static string Username { get; } public static string Password { get; } - public static string Email { get; } + public static string Token { get; } + public static string CommitterName { get; } + public static string CommitterEmail { get; } + public static JsonSerializerSettings SerializerSettings => new JsonSerializerSettings { ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver @@ -36,8 +39,11 @@ static Consts() { Username = _GetString("GitHub:Username"); Password = _GetString("GitHub:Password"); - Email = _GetString("GitHub:Email"); + Token = _GetString("GitHub:Token"); + + CommitterName = _GetString("GitHub:CommitterName"); + CommitterEmail = _GetString("GitHub:CommitterEmail"); } private static string _GetString(string key) @@ -47,7 +53,10 @@ private static string _GetString(string key) ?? Environment.GetEnvironmentVariable(key, EnvironmentVariableTarget.Machine); if (string.IsNullOrEmpty(ev)) + { Console.WriteLine($"Environment variable `{key}` not found."); + return null; + } return ev; } } diff --git a/EhTagClient/RepoClient.cs b/EhTagClient/RepoClient.cs index 6cc8225..f0a8a83 100644 --- a/EhTagClient/RepoClient.cs +++ b/EhTagClient/RepoClient.cs @@ -65,7 +65,7 @@ private readonly LibGit2Sharp.Handlers.CredentialsHandler CredentialsProvider }; }; - public Identity CommandIdentity => new Identity(Consts.Username, Consts.Email); + public Identity CommandIdentity => new Identity(Consts.CommitterName, Consts.CommitterEmail); public string CurrentSha => Repo.Commits.First().Sha;