From faa356a02a7b0b8dea40a2f6c8a03323d7e892a8 Mon Sep 17 00:00:00 2001 From: amid Date: Fri, 19 May 2023 12:43:02 +0600 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A1=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=20=D0=BE=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20ublexec.desktop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ublexec.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ublexec.desktop b/ublexec.desktop index 846ac40..81a685e 100644 --- a/ublexec.desktop +++ b/ublexec.desktop @@ -4,8 +4,8 @@ Name=ublexec Name[ru]=Выполнить как... GenericName=Run as... GenericName[ru]=Выполнить как... -Comment=Run as another user -Comment[ru]=Выполнить от другого пользователя +Comment=Run application as user with changed priority +Comment[ru]=Выполнить приложение от имени пользователя с изменённым приоритетом Type=Application Exec=ublexec Icon=com.ublinux.ublexec From 0e322108dc413bf6df36c0cf0fe5c2d6d22b7312 Mon Sep 17 00:00:00 2001 From: amid Date: Fri, 19 May 2023 12:46:54 +0600 Subject: [PATCH 2/5] Bump version to 2.26 --- VERSION.md | 2 +- source/ublexec.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.md b/VERSION.md index 5bf5e95..eb5943a 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 2.25 +VERSION 2.26 diff --git a/source/ublexec.cc b/source/ublexec.cc index 5cf26c5..b949335 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -4,7 +4,7 @@ using namespace std; int flag_prog_file = 0; string name_app_cmd = ""; -string version_application = "2.25"; +string version_application = "2.26"; int socket_ext_id_I = 0; int socket_trd_id_I = 0; From 139e23c7d0563cad167be47b8089714cda83f6fa Mon Sep 17 00:00:00 2001 From: amid Date: Sat, 20 May 2023 21:07:16 +0600 Subject: [PATCH 3/5] Bump version to 2.27 --- VERSION.md | 2 +- source/ublexec.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.md b/VERSION.md index eb5943a..dd70eaa 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 2.26 +VERSION 2.27 diff --git a/source/ublexec.cc b/source/ublexec.cc index 5853ded..6a6573e 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -4,7 +4,7 @@ using namespace std; int flag_prog_file = 0; string name_app_cmd = ""; -string version_application = "2.26"; +string version_application = "2.27"; int socket_ext_id_I = 0; int socket_trd_id_I = 0; From 77f2653505f9ffee9ff8d08859db8db25b17e978 Mon Sep 17 00:00:00 2001 From: amid Date: Fri, 26 May 2023 21:21:55 +0600 Subject: [PATCH 4/5] Bump version 2.28 --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index dd70eaa..e5300fc 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 2.27 +VERSION 2.28 From b12b47a8b48223e14d70d8d8a1258fcb418e2462 Mon Sep 17 00:00:00 2001 From: amid Date: Wed, 31 May 2023 14:06:47 +0600 Subject: [PATCH 5/5] Delete control VERSION.md --- Makefile | 21 ++++++++------------- VERSION.md | 1 - 2 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 VERSION.md diff --git a/Makefile b/Makefile index 048be5e..bae7c67 100644 --- a/Makefile +++ b/Makefile @@ -8,20 +8,24 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -FILE_VERSION = VERSION.md DEPENDS = /bin/cmake PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR) default_target: all -.PHONY: all init depend debug prepare check build uninstall install clean up_ver help +.PHONY: all init depend debug prepare check build uninstall install clean help all: init build init: @echo "Initialize ..."; \ - sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ublexec.cc; \ + if [ -d ".git" ]; then \ + LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \ + else \ + LATEST_TAG="0.0"; \ + fi; \ + sed -r "s/^(string version_application = ).*/\1\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.cc; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -134,14 +138,6 @@ clean: echo "Clean: OK"; \ fi -up_ver: - @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \ - MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \ - MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \ - VER="$${MAJOR}.$$(($${MINOR}+1))"; \ - sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \ - echo "Updated version to VERSION.md: $${CURRENT} to $${VER}" - help: @echo "The following are some of the valid targets for this Makefile:"; \ echo "... all (the default if no target is provided)"; \ @@ -151,5 +147,4 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean"; \ - echo "... up_ver" \ No newline at end of file + echo "... clean" diff --git a/VERSION.md b/VERSION.md deleted file mode 100644 index e5300fc..0000000 --- a/VERSION.md +++ /dev/null @@ -1 +0,0 @@ -VERSION 2.28