From 4076eb56bb9c68ecd2853f953445aea4557e425d Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Wed, 27 Dec 2023 17:54:37 +0000 Subject: [PATCH] - 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/package/show/devel:microos:kalpa/plasma-branding-Kalpa?expand=0&rev=6 --- kalpa-firstboot | 13 ++++++------- kalpa-firstboot-aarch64 | 11 +++++------ plasma-branding-Kalpa.changes | 11 +++++++++++ plasma-branding-Kalpa.spec | 8 ++++---- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/kalpa-firstboot b/kalpa-firstboot index ed55af2..74796af 100644 --- a/kalpa-firstboot +++ b/kalpa-firstboot @@ -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" + 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 diff --git a/kalpa-firstboot-aarch64 b/kalpa-firstboot-aarch64 index eb8629a..0171cf6 100644 --- a/kalpa-firstboot-aarch64 +++ b/kalpa-firstboot-aarch64 @@ -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" + 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 diff --git a/plasma-branding-Kalpa.changes b/plasma-branding-Kalpa.changes index 08a1dcb..cdfb9a1 100644 --- a/plasma-branding-Kalpa.changes +++ b/plasma-branding-Kalpa.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 27 17:51:05 UTC 2023 - Shawn Dunn + +- 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 diff --git a/plasma-branding-Kalpa.spec b/plasma-branding-Kalpa.spec index e6af4de..a6398d8 100644 --- a/plasma-branding-Kalpa.spec +++ b/plasma-branding-Kalpa.spec @@ -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