From ae5c23b4019b13cdad79f4f188294480eefa2ae1 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Fri, 19 May 2023 13:43:29 +0600
Subject: [PATCH] Bump version to 1.7

---
 Makefile                              | 28 +++++++++++++--------------
 VERSION.md                            |  2 +-
 source/view/ubl-settings-diskquota.cc |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 source/view/ubl-settings-diskquota.cc

diff --git a/Makefile b/Makefile
index 32f1d4e..20db54e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,10 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
 CMAKE_COMMAND = cmake
 CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
 CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-#CMAKE_SOURCE_DIR = ./source
-#CMAKE_BUILD_DIR = ./compile
 FILE_VERSION = VERSION.md
 DEPENDS = /bin/cmake
 PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-diskquota
 
 default_target: all
 
@@ -24,7 +21,7 @@ all: init build
 
 init:
 	@echo "Initialize ..."; \
-	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/view/ubl-settings-diskquota.cc; \
+	sed -r "s/^(string version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/view/${PKGNAME}.cc; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
 
 depend:
@@ -35,8 +32,8 @@ depend:
 		exit 1; \
 	    fi; \
 	done; \
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \
 	echo "Check depends: OK"
-#	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 
 debug:
 	@echo "Debug ..."
@@ -108,7 +105,7 @@ install: check uninstall
 	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 png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
+		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 -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@@ -148,12 +145,13 @@ up_ver:
 	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)"
-	@echo "... init"
-	@echo "... debug"
-	@echo "... prepare"
-	@echo "... compile"
-	@echo "... install"
-	@echo "... uninstall"
-	@echo "... clean"
+	@echo "The following are some of the valid targets for this Makefile:"; \
+	echo "... all (the default if no target is provided)"; \
+	echo "... init"; \
+	echo "... debug"; \
+	echo "... prepare"; \
+	echo "... compile"; \
+	echo "... install"; \
+	echo "... uninstall"; \
+	echo "... clean"; \
+	echo "... up_ver"
\ No newline at end of file
diff --git a/VERSION.md b/VERSION.md
index d65a353..53a0a4e 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 1.6
+VERSION 1.7
diff --git a/source/view/ubl-settings-diskquota.cc b/source/view/ubl-settings-diskquota.cc
old mode 100755
new mode 100644
index 47b4373..4017585
--- a/source/view/ubl-settings-diskquota.cc
+++ b/source/view/ubl-settings-diskquota.cc
@@ -2,7 +2,7 @@
 #define UBL_SETTINGS_DISKQUOTA_H
 #include "ubl-settings-diskquota.h"
 
-string version_application = "1.6";
+string version_application = "1.7";
 bool flag_save = false;
 bool flag_save_local = false;
 bool flag_save_global = false;