diff --git a/.install.sh b/.install.sh deleted file mode 100755 index 6541750..0000000 --- a/.install.sh +++ /dev/null @@ -1,6 +0,0 @@ -make -gcc compile/resources.c source/my_device.c source/philos_utils.c source/philos_utils.h source/my_device.h source/filters.c source/filters.h source/ubl-cmake.h source/view_edit.h source/view_edit.c source/view_add.h source/view_add.c source/ubl-utils.h source/ubl-utils.c source/ubl-strings.h source/ubl-settings-resourcequota.h source/ubl-settings-resourcequota.c -o ubl-settings-resourcequota `pkg-config --cflags --libs gtk+-3.0 vte-2.91 webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -g -sudo make install clean -cd ./terminal-commands -make -cd ../ diff --git a/Makefile b/Makefile index 247a7ad..1b531a5 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/${PKGNAME}.h -PKGIDENT=$(subst /,-,${PREFIX}) +PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) default_target: all @@ -118,14 +118,13 @@ install: check uninstall rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy - @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i - @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" + @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.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}${PKGIDENT}.policy @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; \ @@ -148,7 +147,7 @@ help: echo "... init"; \ echo "... debug"; \ echo "... prepare"; \ - echo "... compile"; \ + echo "... build"; \ echo "... install"; \ echo "... uninstall"; \ echo "... clean" diff --git a/terminal-commands/Makefile b/terminal-commands/Makefile deleted file mode 100644 index a208c59..0000000 --- a/terminal-commands/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f - -#SHELL := /bin/bash - -default_target: all - -.PHONY: all init - -all: init - -init: - @install -Dm644 -t "/usr/share/polkit-1/actions/" "com.ublinux.gdb-debug.policy" \ No newline at end of file diff --git a/terminal-commands/com.ublinux.gdb-debug.policy b/terminal-commands/com.ublinux.gdb-debug.policy deleted file mode 100644 index f6d52d5..0000000 --- a/terminal-commands/com.ublinux.gdb-debug.policy +++ /dev/null @@ -1,24 +0,0 @@ - - - - - UBLinux - https://ublinux.ru - - - Run gdb as root - Запуск утилиты gdb с правами root - Authentication is required to run gdb - Требуется авторизация для запуска утилиты gdb с правами root - - auth_admin - auth_admin - auth_admin - - /usr/bin/gdb - true - - - diff --git a/terminal-commands/make-pot.txt b/terminal-commands/make-pot.txt deleted file mode 100644 index d2d2f2f..0000000 --- a/terminal-commands/make-pot.txt +++ /dev/null @@ -1 +0,0 @@ -xgettext -k_ -o ubl-settings-TEMPLATE.pot --language=C source/ubl-settings-TEMPLATE.c source/ubl-settings-TEMPLATE.h source/ubl-strings.h \ No newline at end of file diff --git a/terminal-commands/sudo-debug.sh b/terminal-commands/sudo-debug.sh deleted file mode 100755 index d13d15b..0000000 --- a/terminal-commands/sudo-debug.sh +++ /dev/null @@ -1 +0,0 @@ -pkexec /usr/bin/gdb "$@" \ No newline at end of file diff --git a/terminal-commands/update-po.txt b/terminal-commands/update-po.txt deleted file mode 100644 index 4769627..0000000 --- a/terminal-commands/update-po.txt +++ /dev/null @@ -1 +0,0 @@ -msgmerge --update ubl-settings-TEMPLATE_ru.po ubl-settings-TEMPLATE.pot \ No newline at end of file