Makefile and code fixes

Makefile

@@ -66,6 +66,7 @@ check:
 build: depend prepare
 	@echo "Build ..."; \
 	$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
+	sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
 	echo "Build: OK"
 
 uninstall:
@@ -88,14 +89,6 @@ uninstall:
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
 	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.checked.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.warning.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.document-green-symbolic.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.document-red-symbolic.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.document-symbolic.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.folder-symbolic.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.folder-green-symbolic.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.folder-red-symbolic.svg"
 	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
@@ -140,7 +133,6 @@ install: check uninstall
 	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Install: OK"
-	@sed -r "s/^(string version_application=\"*\").*/string version_application;/" -i source/${PKGNAME}.h; \
 
 clean:
 	@echo "Clean ..."

source/CMakeLists.txt

@@ -8,11 +8,6 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
 
-#pkg_check_modules(VTE291 REQUIRED vte-2.91)
-#include_directories(${VTE291_INCLUDE_DIRS})
-#link_directories(${VTE291_LIBRARY_DIRS})
-#add_definitions(${VTE291_CFLAGS_OTHER})
-
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
 option(WEBKIT_FOUND "No" OFF)
@@ -82,7 +77,6 @@ set(SOURCE_FILES
 set(LIBRARIES
         ${GTK_LIBRARIES}
         ${WEBKIT_LIBRARIES}
-#        ${VTE291_LIBRARIES}
         pthread)
 
 

source/ubl-settings-repomanager.c

@@ -395,7 +395,7 @@ void yon_add_file(main_window *widgets){
     if (res==GTK_RESPONSE_ACCEPT){
         
         char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
-        FILE *file = popen(yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," |grep -E \"Name|Version|Architecture\" |sed -e 's/  *//g'",NULL),"r");
+        FILE *file = popen(get_package_info_command(filename),"r");
         char *cur_string=g_malloc0(sizeof(char)*4096);
         char *packname=NULL, *packver=NULL, *packarch=NULL;
         while (fgets(cur_string,4096,file)){

source/ubl-settings-repomanager.h

@@ -24,11 +24,13 @@
 #define glade_repo_path "/com/ublinux/ui/ubl-settings-repomanager-windows.glade"
 #define banner_path "/com/ublinux/images/ubl-settings-repomanager-banner.png"
 #define CssPath "/com/ublinux/css/ubl-settings-repomanager.css"
-#define config_path yon_char_unite("/home/",yon_ubl_root_user_get(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
+#define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
 
 #define LocalePath "/usr/share/locale" 
 #define LocaleName "ubl-settings-repomanager"
 typedef char* string;
+
+#define get_package_info_command(filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," |grep -E \"Name|Version|Architecture\" |sed -e 's/  *//g'",NULL)
 string version_application;
 
 char *local;

source/ubl-utils.c

@@ -801,6 +801,10 @@ char *yon_ubl_root_user_get(){
     return getlogin();
 }
 
+char *yon_ubl_user_get_home_directory(){
+    return getenv("HOME");
+}
+
 // parsing functions
 
 

source/ubl-utils.h

@@ -157,6 +157,8 @@ int yon_ubl_check_root();
 
 char *yon_ubl_root_user_get();
 
+char *yon_ubl_user_get_home_directory();
+
 // parsing functions
 
 config_str philos_list_user(int* size);