Accepting request 1135523 from devel:microos:kalpa

- Added eval to kalpa-firstboot and kalpa-firstboot-aarch64
  (boo#1218367)

- Updated to 20231227
- Fixed typos in kalpa-firstboot and kalpa-firstboot-aarch64
  (boo#1218367)
  * Removed improper "" around $dbusRef
  * Corrected PATH for flathub remote
  * Removed installation of kwrite flatpak, GUI text editor is
    being provided via RPM in the pattern

OBS-URL: https://build.opensuse.org/request/show/1135523
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma-branding-Kalpa?expand=0&rev=2
This commit is contained in:
Ana Guerrero 2023-12-28 22:03:57 +00:00 committed by Git OBS Bridge
commit 726410f70d
4 changed files with 34 additions and 19 deletions

View File

@ -7,10 +7,10 @@ run_task() {
local label="$2"
shift 2
qdbus-qt5 "$dbusRef" setLabelText "$label"
qdbus-qt5 $dbusRef setLabelText "$label"
if "$@"; then
qdbus-qt5 "$dbusRef" Set "" value "$step"
if eval "$@"; then
qdbus-qt5 $dbusRef Set "" value "$step"
else
kdialog --error "Operation Failed: $label"
exit 1
@ -18,13 +18,12 @@ run_task() {
}
run_task 1 "Waiting for Internet connection" 'until /usr/bin/ping -q -c 1 flathub.org; do sleep 1; done'
run_task 2 "Adding Flathub Repository" /usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/microos-desktop/flathub.flatpakrepo
run_task 2 "Adding Flathub Repository" /usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/kalpa/flathub.flatpakrepo
run_task 3 "Installing Firefox" /usr/bin/flatpak install --user --noninteractive flathub org.mozilla.firefox
run_task 4 "Installing KCalc" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kcalc
run_task 5 "Installing Ark" /usr/bin/flatpak install --user --noninteractive flathub org.kde.ark
run_task 6 "Installing KWrite" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kwrite
run_task 7 "Setting Default Browser" kwriteconfig5 --file ~/.config/kdeglobals --group General --key BrowserApplication org.mozilla.firefox.desktop
run_task 6 "Setting Default Browser" kwriteconfig5 --file ~/.config/kdeglobals --group General --key BrowserApplication org.mozilla.firefox.desktop
run_task 8 "Cleaning up" rm -f ~/.config/autostart/kalpa-firstboot.desktop
run_task 7 "Cleaning up" rm -f ~/.config/autostart/kalpa-firstboot.desktop
qdbus-qt5 "$dbusRef" close
qdbus-qt5 $dbusRef close

View File

@ -7,10 +7,10 @@ run_task() {
local label="$2"
shift 2
qdbus-qt5 "$dbusRef" setLabelText "$label"
qdbus-qt5 $dbusRef setLabelText "$label"
if "$@"; then
qdbus-qt5 "$dbusRef" Set "" value "$step"
if eval "$@"; then
qdbus-qt5 $dbusRef Set "" value "$step"
else
kdialog --error "Operation Failed: $label"
exit 1
@ -18,11 +18,10 @@ run_task() {
}
run_task 1 "Waiting for Internet connection" 'until /usr/bin/ping -q -c 1 flathub.org; do sleep 1; done'
run_task 2 "Adding Flathub Repository" /usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/microos-desktop/flathub.flatpakrepo
run_task 2 "Adding Flathub Repository" /usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/kalpa/flathub.flatpakrepo
run_task 3 "Installing KCalc" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kcalc
run_task 4 "Installing Ark" /usr/bin/flatpak install --user --noninteractive flathub org.kde.ark
run_task 5 "Installing KWrite" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kwrite
run_task 6 "Cleaning up" rm -f ~/.config/autostart/kalpa-firstboot.desktop
run_task 5 "Cleaning up" rm -f ~/.config/autostart/kalpa-firstboot.desktop
qdbus-qt5 "$dbusRef" close
qdbus-qt5 $dbusRef close

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Dec 27 18:50:53 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>
- Added eval to kalpa-firstboot and kalpa-firstboot-aarch64
(boo#1218367)
-------------------------------------------------------------------
Wed Dec 27 17:51:05 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>
- Updated to 20231227
- Fixed typos in kalpa-firstboot and kalpa-firstboot-aarch64
(boo#1218367)
* Removed improper "" around $dbusRef
* Corrected PATH for flathub remote
* Removed installation of kwrite flatpak, GUI text editor is
being provided via RPM in the pattern
-------------------------------------------------------------------
Mon Dec 18 17:47:25 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>

View File

@ -18,11 +18,11 @@
Name: plasma-branding-Kalpa
Version: 20231218
Version: 20231227
Release: 0
Summary: Kalpa Desktop default settings
License: BSD-3-Clause
URL: http://kalpadesktop.org
URL: http://kalpadesktop.org
Source: COPYING
Source1: flathub.flatpakrepo
Source2: kalpa-firstboot.desktop
@ -30,8 +30,8 @@ Source3: kalpa-firstboot
Source4: 50-desktop.conf
Source7: distrobox-upgrade-all.service
Source8: distrobox-upgrade-all.timer
Source9: 49-kalpa.rules
Source10: 50-kalpa
Source9: 49-kalpa.rules
Source10: 50-kalpa
Source11: kalpa-firstboot-aarch64.desktop
Source12: kalpa-firstboot-aarch64
BuildRequires: flatpak