From c6d2ef34c6bd9bcfbc0b28102dc7cf30eec043fa Mon Sep 17 00:00:00 2001
From: Fupeng Zhao <fupeng.zhao@foxmail.com>
Date: Thu, 27 Jun 2024 19:57:41 +0800
Subject: [PATCH] Fix UnicodeEncodeError in `zkg create` with non-ASCII
 characters in user vars

---
 testing/baselines/tests.template-create/output | 1 +
 testing/tests/template-create                  | 4 ++++
 zeekpkg/template.py                            | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/testing/baselines/tests.template-create/output b/testing/baselines/tests.template-create/output
index cb94d000..16e19565 100644
--- a/testing/baselines/tests.template-create/output
+++ b/testing/baselines/tests.template-create/output
@@ -8,3 +8,4 @@
 <...>/out3 (installed: master) - TODO: A more detailed description of test3.
 error: could not determine value of user variable "name", provide via environment or --user-var
 error: the following features are unknown: "doesntexist". Template "foo" offers "readme".
+"foo" will use value of "name" (the name of the package, e.g. "FooBar") from command line: 你こ안مγПनสXש😊©GBCDČM
diff --git a/testing/tests/template-create b/testing/tests/template-create
index 77e8265f..8dcce668 100644
--- a/testing/tests/template-create
+++ b/testing/tests/template-create
@@ -36,4 +36,8 @@
 # Request an unknown feature. This should fail.
 # @TEST-EXEC-FAIL: zkg create --packagedir out5 --template $TEMPLATES/foo --feature doesntexist >>output 2>&1
 
+# Provide non-ASCII characters variable via --user-var and ensure resulting package installs
+# @TEST-EXEC: zkg create --packagedir out6 --template $TEMPLATES/foo --user-var name=你こ안مγПनสXש😊©GBCDČM >>output
+# @TEST-EXEC: zkg install ./out6
+
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
diff --git a/zeekpkg/template.py b/zeekpkg/template.py
index 6e723de1..69bda068 100644
--- a/zeekpkg/template.py
+++ b/zeekpkg/template.py
@@ -687,8 +687,8 @@ def _replace(self, tmpl, content):
         for name, val in tmpl.params().items():
             pat = "@" + name + "@"
             if not isinstance(content, str):
-                pat = bytes(pat, "ascii")
-                val = bytes(val, "ascii")
+                pat = bytes(pat, "utf-8")
+                val = bytes(val, "utf-8")
             content = re.sub(pat, val, content, flags=re.IGNORECASE)
 
         return content