fix: use kpackagetool6 -g for system-wide plasmoid install
Without -g, kpackagetool installs to the running user HOME. Since the Makefile runs as root, the package ended up in /root/.local/share/ instead of /usr/share/plasma/plasmoids/.
This commit is contained in:
parent
eed04948c7
commit
c8d3143d87
14
Makefile
14
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
|
||||
kpackagetool6 -t Plasma/Applet -u plasmoid/ 2>/dev/null || \
|
||||
kpackagetool6 -t Plasma/Applet -i plasmoid/
|
||||
# Plasmoid package (system-wide, matching lib install paths)
|
||||
kpackagetool6 -g -t Plasma/Applet -u plasmoid/ 2>/dev/null || \
|
||||
kpackagetool6 -g -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
|
||||
|
|
@ -68,7 +68,7 @@ uninstall:
|
|||
rm -f /usr/lib64/qt6/plugins/kf6/krunner/krunner_ollie.so
|
||||
rm -f /usr/lib64/qt6/plugins/kf6/ktexteditor/ollie_kate.so
|
||||
rm -rf /usr/lib64/qt6/qml/org/ollie
|
||||
kpackagetool6 -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true
|
||||
kpackagetool6 -g -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true
|
||||
rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
|
||||
rm -f /usr/local/bin/ollie-ask /usr/local/bin/ollie-session-here
|
||||
ldconfig
|
||||
|
|
@ -93,8 +93,8 @@ dolphin-install:
|
|||
@echo "Dolphin menus installed. Restart Dolphin or re-open context menu."
|
||||
|
||||
plasmoid-install:
|
||||
kpackagetool6 -t Plasma/Applet -u plasmoid/ 2>/dev/null || \
|
||||
kpackagetool6 -t Plasma/Applet -i plasmoid/
|
||||
kpackagetool6 -g -t Plasma/Applet -u plasmoid/ 2>/dev/null || \
|
||||
kpackagetool6 -g -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
|
||||
|
|
@ -107,7 +107,7 @@ plasmoid-install:
|
|||
@echo "Plasmoid installed. Restart plasmashell or add widget."
|
||||
|
||||
plasmoid-uninstall:
|
||||
kpackagetool6 -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true
|
||||
kpackagetool6 -g -t Plasma/Applet -r org.ollie.plasmoid 2>/dev/null; true
|
||||
rm -rf /usr/lib64/qt6/qml/org/ollie
|
||||
rm -f /usr/lib64/libollie-plasmoid-plugin.so
|
||||
ldconfig
|
||||
|
|
|
|||
Reference in New Issue