From 7d89118ae2a699f795fde3890e796815f2aa711e Mon Sep 17 00:00:00 2001
From: jason19970210 <jason19970210@gmail.com>
Date: Tue, 11 Feb 2025 00:37:57 +0800
Subject: [PATCH 1/4] enhancement: add additional command hints for PowerShell
 & CMD resolving wrong signature calculations

---
 templates/user/settings/keys_ssh.tmpl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index b894ccdfbd68f..9c0ec2f9d31df 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -78,7 +78,17 @@
 							<input readonly="" value="{{$.TokenToSign}}">
 							<div class="help">
 								<p>{{ctx.Locale.Tr "settings.ssh_token_help"}}</p>
+								<p>Linux & macOS</p>
 								<p><code>{{printf "echo -n '%s' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey" $.TokenToSign}}</code></p>
+								<details>
+									<summary>Windows PowerShell</summary>
+									<p><code>{{printf "cmd /c \"<NUL set /p =`\"%s`\"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey\"" $.TokenToSign}}</code></p>
+								</details>
+								<br>
+								<details>
+									<summary>Windows CMD</summary>
+									<p><code>{{printf "set /p=%s| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey" $.TokenToSign}}</code></p>
+								</details>
 							</div>
 							<br>
 						</div>

From 2783e30a13356cbd643bf0294d28b5e438eeea80 Mon Sep 17 00:00:00 2001
From: jason19970210 <jason19970210@gmail.com>
Date: Tue, 11 Feb 2025 01:08:02 +0800
Subject: [PATCH 2/4] Remove additional space before '='

remove additional space before '=' for lint checking
---
 templates/user/settings/keys_ssh.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 9c0ec2f9d31df..13836d64e6b75 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -82,7 +82,7 @@
 								<p><code>{{printf "echo -n '%s' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey" $.TokenToSign}}</code></p>
 								<details>
 									<summary>Windows PowerShell</summary>
-									<p><code>{{printf "cmd /c \"<NUL set /p =`\"%s`\"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey\"" $.TokenToSign}}</code></p>
+									<p><code>{{printf "cmd /c \"<NUL set /p=`\"%s`\"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey\"" $.TokenToSign}}</code></p>
 								</details>
 								<br>
 								<details>

From 7b85aebfabc89854139dde35522123b086d9b0b9 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Tue, 11 Feb 2025 01:15:55 +0800
Subject: [PATCH 3/4] fix

---
 templates/user/settings/keys_ssh.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 13836d64e6b75..2691c50c8db3e 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -78,16 +78,15 @@
 							<input readonly="" value="{{$.TokenToSign}}">
 							<div class="help">
 								<p>{{ctx.Locale.Tr "settings.ssh_token_help"}}</p>
-								<p>Linux & macOS</p>
-								<p><code>{{printf "echo -n '%s' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey" $.TokenToSign}}</code></p>
+								<p><code>echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
 								<details>
 									<summary>Windows PowerShell</summary>
-									<p><code>{{printf "cmd /c \"<NUL set /p=`\"%s`\"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey\"" $.TokenToSign}}</code></p>
+									<p><code>cmd /c "&lt;NUL set /p=`"{{$.TokenToSign}}`" | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"</code></p>
 								</details>
 								<br>
 								<details>
 									<summary>Windows CMD</summary>
-									<p><code>{{printf "set /p=%s| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey" $.TokenToSign}}</code></p>
+									<p><code>set /p={{$.TokenToSign}} | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
 								</details>
 							</div>
 							<br>

From 269e7f750c0b61c8f26b8bd3db17e5383a495930 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Tue, 11 Feb 2025 01:50:24 +0800
Subject: [PATCH 4/4] fix space

---
 templates/user/settings/keys_ssh.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 2691c50c8db3e..9d62d4ab08f8b 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -81,12 +81,12 @@
 								<p><code>echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
 								<details>
 									<summary>Windows PowerShell</summary>
-									<p><code>cmd /c "&lt;NUL set /p=`"{{$.TokenToSign}}`" | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"</code></p>
+									<p><code>cmd /c "&lt;NUL set /p=`"{{$.TokenToSign}}`"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"</code></p>
 								</details>
 								<br>
 								<details>
 									<summary>Windows CMD</summary>
-									<p><code>set /p={{$.TokenToSign}} | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
+									<p><code>set /p={{$.TokenToSign}}| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
 								</details>
 							</div>
 							<br>