From 93f9232f1840d5832cfbbad8b1200ac13dba87cd Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Thu, 2 Apr 2026 16:29:56 +0600 Subject: [PATCH] Fixed desktop socket tags --- Makefile | 9 ++++++++- ubl-settings-diskquota.desktop | 2 -- 2 files changed, 8 insertions(+), 3 deletions(-) mode change 100644 => 100755 ubl-settings-diskquota.desktop diff --git a/Makefile b/Makefile index 2ce5c5e..2d1e944 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,14 @@ uninstall: @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \ + install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"; \ + else \ +# install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ +# sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + sed -e "s+/usr/bin+/usr/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + fi @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ diff --git a/ubl-settings-diskquota.desktop b/ubl-settings-diskquota.desktop old mode 100644 new mode 100755 index 44958be..4c59e6c --- a/ubl-settings-diskquota.desktop +++ b/ubl-settings-diskquota.desktop @@ -239,6 +239,4 @@ Icon=com.ublinux.ubl-settings-diskquota Terminal=false StartupNotify=true StartupWMClass=ubl-settings-diskquota -X-XfcePluggable=true -X-UBLPluggable=true Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-SystemSettings;