Root uplifting mechanism update

6 days ago · 1b2c55850a
parent ea393dd28d
commit 1b2c55850a
3 changed files with 87 additions and 22 deletions
--- a/41
+++ b/41
@ -77,76 +77,75 @@ build: depend prepare
 uninstall:
 	@echo "Uninstall ..."
 	@for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \
-#	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
 	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
 	    $(RM) "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
-	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
-	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
+	    $(RM) "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+	    $(RM) "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
 	done
 	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
-	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
+	        $(RM) "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	done
 	@for FILE_ICON in $(wildcard icons/*/*.svg); do \
 	    SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \
-	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \
+	    $(RM) "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \
 	done
-	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
+	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" "${DESTDIR}${PREFIX}/bin/${PKGNAME}-root" "${DESTDIR}${PREFIX}/bin/${PKGNAME}-user"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
 	@if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \
 	    $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"; \
 	else \
-#	    $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
 	    $(RM) "${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; \
+	    [[ -d "${DESTDIR}/usr/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
-	    [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	    [[ -d "${DESTDIR}/usr/share/applications" ]] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Uninstall: OK"

 install: check uninstall
 	@echo "Install ..."
 	@for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \
-	    install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
-#	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
+	    install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \
 	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
 	    PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \
 	    msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \
 	done
 	@for SIZE in 16 32 48; do \
-	    install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
-	    rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+	    install -dm755 "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
+	    rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
 	done
 	@for FILE_ICON in $(wildcard icons/*/*.svg); do \
 	    SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \
-	    install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \
+	    install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \
 	done
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
+	@ln -s "/usr/bin/ubl-exec-app" "${DESTDIR}${PREFIX}/bin/${PKGNAME}-root"
+	@ln -s "/usr/bin/ubl-exec-app" "${DESTDIR}${PREFIX}/bin/${PKGNAME}-user"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
 	@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//\//-}-local.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+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}/usr/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"; \
+	    sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}-local.policy;\
 	fi
 	@if [[ -z "${DESTDIR}" ]]; then \
-	    ldconfig -n ${DESTDIR}${PREFIX}/lib; \
-	    [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
+	    ldconfig -n ${DESTDIR}/usr/lib; \
+	    [[ -d "${DESTDIR}/usr/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
-	    [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	    [[ -d "${DESTDIR}/usr/share/applications" ]] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Install: OK"

 clean:
 	@echo "Clean ..."
-	@$(RM) -rd ${CMAKE_BUILD_DIR}
+	@$(RM) -rd "${CMAKE_BUILD_DIR}"
 	@if [[ -d "${CMAKE_BUILD_DIR}" ]]; then \
 	    echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
 	else \
--- a/com.ublinux.ubl-settings-resourcequota.policy
+++ b/com.ublinux.ubl-settings-resourcequota.policy
@ -5,6 +5,7 @@
 <policyconfig>
  <vendor>UBLinux</vendor>
  <vendor_url>https://ublinux.com</vendor_url>
+  <icon_name>com.ublinux.ubl-settings-resourcequota</icon_name>
  <action id="com.ublinux.ubl-settings-resourcequota.run">
    <description>Run CPU and RAM quota settings as root</description>
    <description xml:lang="zh_TW">以 root 身份運行 CPU 和 RAM 配額設定</description>
--- a/ubl-settings-resourcequota.desktop
+++ b/ubl-settings-resourcequota.desktop
@ -234,7 +234,7 @@ Keywords[as]=সম্পদ;কোটা;
 Keywords[ar]=الموارد;الحصة;
 Keywords[af]=hulpbron;kwota;
 Type=Application
-Exec=ubl-settings-resourcequota
+Exec=ubl-settings-resourcequota-user
 Icon=com.ublinux.ubl-settings-resourcequota
 Terminal=false
 StartupNotify=true
@ -242,3 +242,68 @@ StartupWMClass=ubl-settings-resourcequota
 X-XfcePluggable=true
 X-UBLPluggable=true
 Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-SystemSettings;
+
+Actions=RunAsRoot;
+
+[Desktop Action RunAsRoot]
+Exec=ubl-settings-usergroups-root
+Icon=com.ublinux.ubl-settings-usergroups
+Name=Run as root
+#Name[zh_TW]=
+#Name[zh_CN]=
+#Name[te]=
+#Name[uk]=
+#Name[tr]=
+#Name[ta]=
+#Name[sv]=
+#Name[sr@latin]=
+#Name[sr]=
+#Name[sl]=
+#Name[sk]=
+Name[ru]=Запустить от root
+#Name[ro]=
+#Name[pt_BR]=
+#Name[pt]=
+#Name[pl]=
+#Name[pa]=
+#Name[or]=
+#Name[oc]=
+#Name[nn]=
+#Name[nl]=
+#Name[mr]=
+#Name[ml]=
+#Name[lv]=
+#Name[lt]=
+#Name[ko]=
+#Name[kn]=
+#Name[kk]=
+#Name[ka]=
+#Name[ja]=
+#Name[it]=
+#Name[id]=
+#Name[ia]=
+#Name[hu]=
+#Name[hr]=
+#Name[hi]=
+#Name[he]=
+#Name[gu]=
+#Name[gl]=
+#Name[fur]=
+#Name[fr]=
+#Name[fi]=
+#Name[eu]=
+#Name[es]=
+#Name[eo]=
+Name[en_GB]=Run as root
+#Name[el]=
+#Name[de]=
+#Name[da]=
+#Name[cs]=
+#Name[ca]=
+#Name[bn_IN]=
+#Name[bg]=
+#Name[ast]=
+#Name[as]=
+#Name[ar]=
+#Name[af]=
+