bug fixes

Reviewed-on: YanTheKaller/ubl-settings-manager#14

 	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
 	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.png"
 	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg"
+	@$(RM) "/usr/share/icons/hicolor/scalable/apps/ubconfig-gui.svg"

 	@install -dm755 /usr/share/icons/hicolor/scalable/apps
 	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg
-	@install -dm755 /usr/share/icons/hicolor/scalable/status
+	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ubconfig-gui.svg

 #define GlobalConfigPath "/etc/ubconfig-main.conf"
 #define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf"
-#define AppIconPath "/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg"
+#define AppIconPath "/usr/share/icons/hicolor/scalable/apps/ubconfig-gui.svg"

 Type=Application
 Exec=ubl-settings-manager
-Icon=ublinux-ubconfig
+Icon=ubconfig-gui

 		install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \
 		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \
 	done
-	@install -dm755 /usr/share/icons/hicolor/scalable/apps

 CMAKE_SOURCE_DIR = ./source
 CMAKE_BUILD_DIR = ./compile
 PKGNAME = $(MAKEFILE_DIR)
+version_application = 

+  	version=$${version:8}; \
+  	search="s/string version_application.*$&"; \
+  	replace="string version_application = \"$${version}\";"; \
+  	sed -i -e "$$search/$$replace/gi" source/ubl-settings-datetime.h; \

 	@install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} 
-	@install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop 
+	@install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop; \
+	if [ ! -d "/usr/share/${PKGNAME}" ]; then \

 	@install -Dm644 -t /usr/share/${PKGNAME}/css/ ${PKGNAME}.css
-	@install -Dm644 -t /etc/ ubconfig-main.conf
+	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ublinux-logo.svg
+	@install -Dm644 -t /etc/ ubconfig-main.conf; \

+string version_application = "1.1";

         }
+        
     }
+    printf("среднее время на каждую проверку: %f\n",yon_time_average(times)/1000);

 #define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf"
-#define AppIconPath "/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg"
-#define AppBannerPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.png"
+#define AppIconPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg"

+#define AppBannerPath "//usr/share/ubl-settings-manager/ui/ubl-settings-manager.png"
 #define DesktopPath "/usr/share/applications/"
 #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/"
 #define ErrIconPicturePath "/usr/share/icons/Faenza/emblems/32/emblem-important.png"

 	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
 	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.png"
 	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg"
+	@$(RM) "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg"

+	@$(RM) -d "/usr/share/${PKGNAME}/css"
+	@$(RM) -d "/usr/share/${PKGNAME}/ui"
+	@$(RM) -d "/usr/share/${PKGNAME}"
 	@$(RM) "/etc/ubconfig-main.conf"

-	chmod 766 /etc/ubconfig-main.conf
-	@install -Dm655 -t ~/.config/ ubconfig-main.conf
-	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.png 
+	@chmod 766 /etc/ubconfig-main.conf

 
 #define GladePath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager.glade"
 #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
 #define GlobalConfigPath "/etc/ubconfig-main.conf"

 #define GladePath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager.glade"
 #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
 #define GlobalConfigPath "/etc/ubconfig-main.conf"
 #define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf"

+Icon=ubl-settings-manager
 Terminal=false
 X-XfcePluggable=false
 Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;