mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 09:01:55 +00:00
* fix?(micro-default-editor): Just dep on Micro
* chore(update.rhai): Handle GPG imports
---------
(cherry picked from commit 1c8d4767ab)
Signed-off-by: Gilver <rockgrub@disroot.org>
Co-authored-by: Gilver <rockgrub@disroot.org>
This commit is contained in:
@@ -15,7 +15,7 @@ Source2: https://raw.githubusercontent.com/terrapkg/pkg-micro-default-edit
|
||||
# For EVR macro
|
||||
BuildRequires: anda-srpm-macros
|
||||
Requires: default-editor
|
||||
Requires: (micro = %{evr} or micro-nightly)
|
||||
Requires: micro
|
||||
# All default editor packages MUST provide this
|
||||
Provides: system-default-editor
|
||||
BuildArch: noarch
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
let v = sh("dnf info micro | grep Version | grep -Eo '[0-9]+\\.[0-9]+.*'", #{"stdout": "piped"}).ctx.stdout;
|
||||
let v = sh("dnf info micro -y | grep Version | grep -Eo '[0-9]+\\.[0-9]+.*'", #{"stdout": "piped"}).ctx.stdout;
|
||||
v.pop();
|
||||
rpm.version(v);
|
||||
let r = sh("dnf info micro | grep Release | grep -Eo '[0-9]+' | head -1", #{"stdout": "piped"}).ctx.stdout;
|
||||
let r = sh("dnf info micro -y | grep Release | grep -Eo '[0-9]+' | head -1", #{"stdout": "piped"}).ctx.stdout;
|
||||
r.pop();
|
||||
rpm.f = sub(`Release: (.+?)\n`, "Release: " + r + "%{?dist}\n", rpm.f);
|
||||
let e = sh("dnf info micro | grep Epoch | grep -Eo '[0-9]+'", #{"stdout": "piped"}).ctx.stdout;
|
||||
let e = sh("dnf info micro -y | grep Epoch | grep -Eo '[0-9]+'", #{"stdout": "piped"}).ctx.stdout;
|
||||
e.pop();
|
||||
rpm.f = sub(`Epoch: (.+?)\n`, "Epoch: " + e + "\n", rpm.f);
|
||||
|
||||
Reference in New Issue
Block a user