code

4 files changed, 26 insertions, 27 deletions

diff --git a/ci/release.py b/ci/release.py
index 408938c..7f56774 100755
--- a/ci/release.py
+++ b/ci/release.py
@@ -142,8 +142,8 @@ def _template(project: _Project) -> None:
         "x86_uri": x86_uri,
     }
     j2 = _build_j2()
-    brew_rend = j2.get_template("homebrew.rb.j2").render(**vals)
-    snap_rend = j2.get_template("snapcraft.yml.j2").render(**vals)
+    brew_rend = j2.get_template("homebrew.rb").render(**vals)
+    snap_rend = j2.get_template("snapcraft.yml").render(**vals)
 
     with _git_ops() as cwd:
         (cwd / "sad.rb").write_text(brew_rend)
diff --git a/ci/templates/homebrew.rb b/ci/templates/homebrew.rb
new file mode 100644
index 0000000..b977e70
--- /dev/null
+++ b/ci/templates/homebrew.rb
@@ -0,0 +1,22 @@
+class Sad < Formula
+  desc '{{ desc }}'
+  homepage '{{ repo }}'
+  version '{{ version }}'
+
+  if Hardware::CPU.arm?
+    url '{{ aarch64_uri }}'
+    sha256 '{{ aarch64_sha }}'
+  end
+
+  if Hardware::CPU.intel?
+    url '{{ x86_uri }}'
+    sha256 '{{ x86_sha }}'
+  end
+
+  depends_on 'fzf'
+  depends_on 'git-delta'
+
+  def install
+    bin.install 'sad'
+  end
+end
diff --git a/ci/templates/homebrew.rb.j2 b/ci/templates/homebrew.rb.j2
deleted file mode 100644
index 9e14310..0000000
--- a/ci/templates/homebrew.rb.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-class Sad < Formula
-  desc "{{ desc }}"
-  homepage "{{ repo }}"
-  version "{{ version }}"
-
-  if Hardware::CPU.arm?
-    url "{{ aarch64_uri }}"
-    sha256 "{{ aarch64_sha }}"
-  end
-
-  if Hardware::CPU.intel?
-    url "{{ x86_uri }}"
-    sha256 "{{ x86_sha }}"
-  end
-
-  depends_on "fzf"
-  depends_on "git-delta"
-
-  def install
-    bin.install "sad"
-  end
-end
diff --git a/ci/templates/snapcraft.yml.j2 b/ci/templates/snapcraft.yml
index 234f850..a4954e6 100644
--- a/ci/templates/snapcraft.yml.j2
+++ b/ci/templates/snapcraft.yml
@@ -1,6 +1,6 @@
 name: sad
 
-base: core18
+base: core20
 
 version: "{{ version }}"
 
@@ -10,7 +10,6 @@ summary: |-
 description: |-
   {{ long_desc | indent(2) }}
 
-
 grade: stable
 confinement: devmode
 
@@ -21,4 +20,4 @@ apps:
 parts:
   sad:
     plugin: rust
-    source: {{ repo }}
+    source: "{{ repo }}"