update szep.25 calamares fix

3 files changed, 24 insertions, 4 deletions

diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
index 56cc368..8a51e3c 100644
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
@@ -414,3 +414,24 @@ QScrollBar::handle:horizontal {
 QScrollBar::handle:horizontal:hover {
     background-color: #95a5a6;
 }
+
+/* ---------------- RaveOS restart dialog ---------------- */
+
+#raveosDialog {
+    background-color: #2B2B2B;
+}
+
+#raveosDialogLabel {
+    color: #ECF0F1;
+    font-size: 15px;
+    padding: 6px 2px;
+}
+
+#raveosDialogCancel {
+    background-color: #7f8c8d;
+    color: #ffffff;
+}
+
+#raveosDialogCancel:hover {
+    background-color: #95a5a6;
+}
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/supporters.js b/raveos-calamares-theme/etc/calamares/branding/raveos/supporters.js
index 81c533f..2e9859d 100644
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/supporters.js
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/supporters.js
@@ -1,9 +1,8 @@
 // RaveOS supporters list
 // The Calamares finished page reads this file (finishedq.qml).
-// One name per line. The list can also be refreshed during install from:
-//   https://page.rp1.hu/supporters.js
+// One name per line inside the array. The list can also be refreshed
+// during install from: https://page.rp1.hu/supporters.js
 .pragma library
 
 var names = [
-    "New Supporter"
 ]
diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf
index 35c080f..2f6c6d8 100644
--- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf
+++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-supporters.conf
@@ -5,5 +5,5 @@ script:
   # RaveOS: fetch the fresh supporters list (if online). Validated steps:
   # download -> check "var names" and "]" -> replace. On any error the
   # packaged list stays (|| true).
-  - command: "curl -fsSL --max-time 10 https://page.rp1.hu/supporters.js -o /tmp/raveos_supporters.js && grep -q 'var names' /tmp/raveos_supporters.js && grep -q ']' /tmp/raveos_supporters.js && cp /tmp/raveos_supporters.js /etc/calamares/branding/raveos/supporters.js || true"
+  - command: "curl -fsSL --max-time 10 https://page.rp1.hu/supporters.js?t=$(date +%s) -o /tmp/raveos_supporters.js && grep -q 'var names' /tmp/raveos_supporters.js && grep -q ']' /tmp/raveos_supporters.js && cp /tmp/raveos_supporters.js /etc/calamares/branding/raveos/supporters.js || true"
     name: "Downloading supporters list..."