diff --git a/Makefile b/Makefile index 775930c..a84883f 100644 --- a/Makefile +++ b/Makefile @@ -45,9 +45,9 @@ install: install -m755 $(BUILD_DIR)/lib/libollie-plasmoid-plugin.so /usr/lib64/ printf 'module org.ollie.private\nplugin ollie-plasmoid-pluginplugin\ntypeinfo ollie-plasmoid-plugin.qmltypes\ndepends QtQuick\n' | \ tee /usr/lib64/qt6/qml/org/ollie/private/qmldir > /dev/null - # Plasmoid package (force-update by removing first) - kpackagetool6 -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true - kpackagetool6 -t Plasma/Applet -i plasmoid/ + # Plasmoid package + kpackagetool6 -t Plasma/Applet -u plasmoid/ 2>/dev/null || \ + kpackagetool6 -t Plasma/Applet -i plasmoid/ # Dolphin service menus + helper scripts mkdir -p ~/.local/share/kio/servicemenus rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop @@ -93,8 +93,8 @@ dolphin-install: @echo "Dolphin menus installed. Restart Dolphin or re-open context menu." plasmoid-install: - kpackagetool6 -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true - kpackagetool6 -t Plasma/Applet -i plasmoid/ + kpackagetool6 -t Plasma/Applet -u plasmoid/ 2>/dev/null || \ + kpackagetool6 -t Plasma/Applet -i plasmoid/ mkdir -p /usr/lib64/qt6/qml/org/ollie/private install -m755 $(BUILD_DIR)/org/ollie/private/ollie-plasmoid-pluginplugin.so \ /usr/lib64/qt6/qml/org/ollie/private/libollie-plasmoid-pluginplugin.so @@ -137,8 +137,8 @@ kf5-install: cp -a plasmoid /tmp/ollie-plasmoid-kf5 cp plasmoid/metadata-kf5.json /tmp/ollie-plasmoid-kf5/metadata.json cp plasmoid/contents/ui/main-kf5.qml /tmp/ollie-plasmoid-kf5/contents/ui/main.qml - kpackagetool5 -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true - kpackagetool5 -t Plasma/Applet -i /tmp/ollie-plasmoid-kf5/ + kpackagetool5 -t Plasma/Applet -u /tmp/ollie-plasmoid-kf5/ 2>/dev/null || \ + kpackagetool5 -t Plasma/Applet -i /tmp/ollie-plasmoid-kf5/ $(RM) -r /tmp/ollie-plasmoid-kf5 # Dolphin service menus + helper scripts mkdir -p ~/.local/share/kio/servicemenus