From 312429dcd4c4f92cc80bcfdade5e3a77799097c0 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 11 Mar 2025 10:40:59 -0500 Subject: [PATCH] fix(xpadneo, xone, xpad-noone): Actually fix update scripts (#3845) (#3864) * Remove weirdness * Add space * Add space * Remove extra macros * Somehow this wasn't updated * Update update.rhai * Update update.rhai * Update update.rhai * Update update.rhai * Update update.rhai * Update dkms-xpad-noone.spec * Update xpad-noone-kmod.spec * Update dkms-xpadneo.spec * Update xpadneo-kmod.spec --------- (cherry picked from commit 46eb0c0bd57d0f8241a6ce93a226fde91e2c19b6) Signed-off-by: Gilver Signed-off-by: RockGrub --- anda/system/xone/akmod/update.rhai | 2 +- anda/system/xone/dkms/update.rhai | 6 +++--- anda/system/xpad-noone/akmod/update.rhai | 2 +- anda/system/xpad-noone/dkms/update.rhai | 2 +- anda/system/xpadneo/akmod/update.rhai | 2 +- anda/system/xpadneo/dkms/update.rhai | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai index 95295c3ac6..1e2fcbcc56 100644 --- a/anda/system/xone/akmod/update.rhai +++ b/anda/system/xone/akmod/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai index 0ac5d9b6bb..1e2fcbcc56 100644 --- a/anda/system/xone/dkms/update.rhai +++ b/anda/system/xone/dkms/update.rhai @@ -1,11 +1,11 @@ -let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xpad-noone/akmod/update.rhai b/anda/system/xpad-noone/akmod/update.rhai index 05ee92a730..26a5eb17b4 100644 --- a/anda/system/xpad-noone/akmod/update.rhai +++ b/anda/system/xpad-noone/akmod/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xpad-noone/dkms/update.rhai b/anda/system/xpad-noone/dkms/update.rhai index 05ee92a730..26a5eb17b4 100644 --- a/anda/system/xpad-noone/dkms/update.rhai +++ b/anda/system/xpad-noone/dkms/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai index 2a64921582..b7de501f56 100644 --- a/anda/system/xpadneo/akmod/update.rhai +++ b/anda/system/xpadneo/akmod/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai index 2a64921582..b7de501f56 100644 --- a/anda/system/xpadneo/dkms/update.rhai +++ b/anda/system/xpadneo/dkms/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() {