XR for Universal Blue and Fedora Atomic Desktops
vr
fedora-atomic
linux
runtime: support non-atomic Fedora
Signed-off-by: MatrixFurry <did:plc:zmjoeu3stwcn44647rhxa44o>
+22
-12
+22
-12
src/atomic-xr/runtime.nu
+22
-12
src/atomic-xr/runtime.nu
···
80
80
}
81
81
82
82
if ($missing_packages | is-not-empty) {
83
-
rpm-ostree install ...$missing_packages
84
-
job spawn {
85
-
match (notify-send -u critical "Package(s) installed" "Please reboot or use `rpm-ostree ex apply-live` to apply changes." -A reboot="Reboot" -A live="Apply Changes Live") {
86
-
"reboot" => (systemctl reboot)
87
-
"live" => (pkexec rpm-ostree ex apply-live)
83
+
if (sys host).name == "Fedora Linux" {
84
+
pkexec dnf install ...$missing_packages
85
+
} else {
86
+
rpm-ostree install ...$missing_packages
87
+
88
+
job spawn {
89
+
match (notify-send -u critical "Package(s) installed" "Please reboot or use `rpm-ostree ex apply-live` to apply changes." -A reboot="Reboot" -A live="Apply Changes Live") {
90
+
"reboot" => (systemctl reboot)
91
+
"live" => (pkexec rpm-ostree ex apply-live)
92
+
}
88
93
}
94
+
null
89
95
}
90
-
null
91
96
}
92
97
}
93
98
···
102
107
}
103
108
104
109
if ($installed_packages | is-not-empty) {
105
-
rpm-ostree remove ...$installed_packages
106
-
job spawn {
107
-
match (notify-send -u critical "Package(s) removed" "Please reboot or use `rpm-ostree ex apply-live` to apply changes." -A reboot="Reboot" -A live="Apply Changes Live") {
108
-
"reboot" => (systemctl reboot)
109
-
"live" => (pkexec rpm-ostree ex apply-live --allow-replacement)
110
+
if (sys host).name == "Fedora Linux" {
111
+
pkexec dnf remove ...$installed_packages
112
+
} else {
113
+
rpm-ostree remove ...$installed_packages
114
+
115
+
job spawn {
116
+
match (notify-send -u critical "Package(s) removed" "Please reboot or use `rpm-ostree ex apply-live` to apply changes." -A reboot="Reboot" -A live="Apply Changes Live") {
117
+
"reboot" => (systemctl reboot)
118
+
"live" => (pkexec rpm-ostree ex apply-live --allow-replacement)
119
+
}
110
120
}
121
+
null
111
122
}
112
-
null
113
123
}
114
124
}