From 2009984976b76c82fb558b2331ffe8d418d18f82 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sat, 25 Mar 2023 08:14:51 +0800 Subject: [PATCH] feat: update age cli --- .../me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java | 2 +- src/main/java/me/hatter/tools/tinyencrypt/util/AgeCliUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java index 2f4de6e..5d61d85 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java @@ -1,7 +1,7 @@ package me.hatter.tools.tinyencrypt.config; public class TinyEncryptConstant { - public static final String VERSION = "0.6.2"; + public static final String VERSION = "0.6.3"; public static final String ENC_FILE_EXT = ".tinyenc"; } diff --git a/src/main/java/me/hatter/tools/tinyencrypt/util/AgeCliUtil.java b/src/main/java/me/hatter/tools/tinyencrypt/util/AgeCliUtil.java index ac95575..f68bd5b 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/util/AgeCliUtil.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/util/AgeCliUtil.java @@ -28,7 +28,7 @@ public class AgeCliUtil { final RFile recipientAgeFileWithoutSerial = RFile.fromUserHome(".tinyencrypt/" + ageRecipient + ".age"); final RFile recipientAgeFileWithSerial = serialOpt.map(s -> RFile.fromUserHome(".tinyencrypt/" + ageRecipient + ".age." + s)).orElse(null); - final RFile recipientAgeFile = (recipientAgeFileWithSerial != null && recipientAgeFileWithSerial.isFile()) + final RFile recipientAgeFile = ((recipientAgeFileWithSerial != null) && recipientAgeFileWithSerial.isFile()) ? recipientAgeFileWithSerial : recipientAgeFileWithoutSerial; AssertUtil.isTrue(recipientAgeFile.isFile(), "Age key file required");