diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 28e11d04b..cf6343f73 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -38,6 +38,8 @@ check() { package() { cd "$pkgname-$pkgver" python setup.py install --root="$pkgdir" + install -vDm644 -t "${pkgdir}/usr/share/pixmaps" plover/assets/plover.png + install -vDm644 -t "${pkgdir}/usr/share/applications" application/plover.desktop chmod og+rX -R "$pkgdir" } diff --git a/linux/appimage/build.sh b/linux/appimage/build.sh index 790454787..2430be805 100755 --- a/linux/appimage/build.sh +++ b/linux/appimage/build.sh @@ -121,11 +121,9 @@ python='appdir_python' # Install Plover and dependencies. bootstrap_dist "$wheel" -# Note: those will re-appear in their respective -# locations when creating the AppImage... -# ¯\_(ツ)_/¯ -run mv "$appdir/usr/share/applications/plover.desktop" "$appdir/plover.desktop" -run mv "$appdir/usr/share/pixmaps/plover.png" "$appdir/plover.png" +# Add desktop integration. +run cp 'application/plover.desktop' "$appdir/plover.desktop" +run cp 'plover/assets/plover.png' "$appdir/plover.png" # Trim the fat. run "$python" -m utils.trim "$appdir" linux/appimage/blacklist.txt diff --git a/rpm/package.spec b/rpm/package.spec index ef10f4e27..4353009bb 100644 --- a/rpm/package.spec +++ b/rpm/package.spec @@ -46,6 +46,8 @@ env PYTHONPATH="$PWD/.deps" %{__python3} setup.py compile_catalog build_ui build %install env PYTHONPATH="$PWD/.deps" %py3_install +install -vDm644 -t "%{buildroot}/usr/share/pixmaps" plover/assets/plover.png +install -vDm644 -t "%{buildroot}/usr/share/applications" application/plover.desktop %check env PYTHONPATH="$PWD/.deps" %{__python3} setup.py test diff --git a/setup.py b/setup.py index a4f053e1f..74341a4b8 100755 --- a/setup.py +++ b/setup.py @@ -467,8 +467,4 @@ def run(self): options=options, cmdclass=cmdclass, extras_require=extras_require, - data_files=[ - ('share/applications', ['application/plover.desktop']), - ('share/pixmaps', ['plover/assets/plover.png']), - ], )