From e288b28e6402a2a729a096a0040d9852edd4ca0c Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sat, 1 Mar 2025 18:27:36 -0800
Subject: [PATCH] Fix: xpadneo and xone update scripts (#3641) (#3652)

* New update scripts

* Add missing semicolons

(cherry picked from commit b535009b6e569a967ff046a91da47ac380f94cad)

Co-authored-by: Gilver <rockgrub@disroot.org>
---
 anda/system/xone/akmod/update.rhai          | 14 ++++++++++++--
 anda/system/xone/akmod/xone-kmod.spec       |  2 +-
 anda/system/xone/dkms/dkms-xone.spec        |  2 +-
 anda/system/xone/dkms/update.rhai           | 14 ++++++++++++--
 anda/system/xpadneo/akmod/update.rhai       | 14 ++++++++++++--
 anda/system/xpadneo/akmod/xpadneo-kmod.spec |  2 +-
 anda/system/xpadneo/dkms/dkms-xpadneo.spec  |  2 +-
 anda/system/xpadneo/dkms/update.rhai        | 14 ++++++++++++--
 8 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai
index 72dee90d6d..9df561bc86 100644
--- a/anda/system/xone/akmod/update.rhai
+++ b/anda/system/xone/akmod/update.rhai
@@ -1,3 +1,13 @@
-import "andax/bump_extras.rhai" as bump;
+let c = sh("cat anda/system/xone/kmod-common/xone-kmod-common.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-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout;
+    d.pop();
+    rpm.global("date", d);
+    let v = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
+    v.pop();
+    rpm.global("ver", v);
+}
 
-rpm.version(bump::madoguchi("xone-kmod-common", labels.branch));
diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec
index 3376fe5ce2..ddacaf42d3 100644
--- a/anda/system/xone/akmod/xone-kmod.spec
+++ b/anda/system/xone/akmod/xone-kmod.spec
@@ -7,7 +7,7 @@
 %global real_name xone
 
 Name:           %{real_name}-kmod
-Version:        0.3^20241223git.6b9d59a
+Version:        %{ver}^%{date}git.%{shortcommit}
 Release:        1%?dist
 Summary:        Linux kernel driver for Xbox One and Xbox Series X|S accessories
 License:        GPL-2.0-or-later
diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec
index c1c21abc87..d1c814b28b 100644
--- a/anda/system/xone/dkms/dkms-xone.spec
+++ b/anda/system/xone/dkms/dkms-xone.spec
@@ -6,7 +6,7 @@
 %global dkms_name xone
 
 Name:           dkms-%{dkms_name}
-Version:        0.3^20241223git.6b9d59a
+Version:        %{ver}^%{date}git.%{shortcommit}
 Release:        1%?dist
 Summary:        Linux kernel driver for Xbox One and Xbox Series X|S accessories
 License:        GPL-2.0-or-later
diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai
index 72dee90d6d..9df561bc86 100644
--- a/anda/system/xone/dkms/update.rhai
+++ b/anda/system/xone/dkms/update.rhai
@@ -1,3 +1,13 @@
-import "andax/bump_extras.rhai" as bump;
+let c = sh("cat anda/system/xone/kmod-common/xone-kmod-common.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-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout;
+    d.pop();
+    rpm.global("date", d);
+    let v = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
+    v.pop();
+    rpm.global("ver", v);
+}
 
-rpm.version(bump::madoguchi("xone-kmod-common", labels.branch));
diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai
index e51de83ed3..cd0af3f5e2 100644
--- a/anda/system/xpadneo/akmod/update.rhai
+++ b/anda/system/xpadneo/akmod/update.rhai
@@ -1,3 +1,13 @@
-import "andax/bump_extras.rhai" as bump;
+let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.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/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout;
+    d.pop();
+    rpm.global("date", d);
+    let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
+    v.pop();
+    rpm.global("ver", v);
+}
 
-rpm.version(bump::madoguchi("xpadneo-kmod-common", labels.branch));
diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec
index 5558ba044c..918ec1ff26 100644
--- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec
+++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec
@@ -7,7 +7,7 @@
 %global real_name xpadneo
 
 Name:           %{real_name}-kmod
-Version:        0.9.7^20241224git.8d20a23
+Version:        %{ver}^%{date}git.%{shortcommit}
 Release:        1%?dist
 Summary:        Advanced Linux Driver for Xbox One Wireless Gamepad
 License:        GPL-3.0
diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec
index 2111a8f3e0..3d407a57de 100644
--- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec
+++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec
@@ -6,7 +6,7 @@
 %global dkms_name xpadneo
 
 Name:           dkms-%{dkms_name}
-Version:        0.9.7^20241224git.8d20a23
+Version:        %{ver}^%{date}git.%{shortcommit}
 Release:        1%?dist
 Summary:        Advanced Linux Driver for Xbox One Wireless Gamepad
 License:        GPL-3.0
diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai
index e51de83ed3..cd0af3f5e2 100644
--- a/anda/system/xpadneo/dkms/update.rhai
+++ b/anda/system/xpadneo/dkms/update.rhai
@@ -1,3 +1,13 @@
-import "andax/bump_extras.rhai" as bump;
+let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.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/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout;
+    d.pop();
+    rpm.global("date", d);
+    let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
+    v.pop();
+    rpm.global("ver", v);
+}
 
-rpm.version(bump::madoguchi("xpadneo-kmod-common", labels.branch));