build: add icon prefix + improve uninstall targets

Author: Toni500github

CMakeLists.txt

@@ -99,6 +99,7 @@ add_dependencies(${TARGET_NAME} locale)
 set(MANPREFIX "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Man page installation directory")
 set(APPPREFIX "${CMAKE_INSTALL_PREFIX}/share/applications" CACHE PATH "Application desktop file directory")
 set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale files directory")
+set(ICONPREFIX "${CMAKE_INSTALL_PREFIX}/share/pixmaps" CACHE PATH "Icon installation directory")
 
 # Install executable
 install(TARGETS ${TARGET_NAME}
@@ -125,6 +126,10 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
         DESTINATION share/customfetch/examples
         COMPONENT runtime)
 
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/assets/icons/
+        DESTINATION share/pixmaps/customfetch
+        COMPONENT runtime)
+
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/locale/
         DESTINATION share/locale
         COMPONENT runtime)

Makefile

@@ -4,6 +4,7 @@ PREFIX	  	?= /usr
 MANPREFIX	?= $(PREFIX)/share/man
 APPPREFIX 	?= $(PREFIX)/share/applications
 LOCALEDIR	?= $(PREFIX)/share/locale
+ICONPREFIX 	?= $(PREFIX)/share/pixmaps
 VARS  	  	?= -DENABLE_NLS=1
 
 DEBUG 		?= 1
@@ -109,7 +110,7 @@ usr-dist: $(TARGET) locale
 	rm -rf usr/
 
 clean:
-	rm -rf $(BUILDDIR)/$(TARGET) $(BUILDDIR)/libcustomfetch.a $(OBJ)
+	rm -rf $(BUILDDIR)/$(TARGET) $(BUILDDIR)/lib$(NAME).a $(OBJ)
 
 distclean:
 	rm -rf $(BUILDDIR) ./tests/$(BUILDDIR) $(OBJ)
@@ -126,8 +127,9 @@ install-common: locale
 	sed -e "s/@VERSION@/$(VERSION)/g" -e "s/@BRANCH@/$(BRANCH)/g" < $(NAME).1 > $(DESTDIR)$(MANPREFIX)/man1/$(NAME).1
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/$(NAME).1
 	install LICENSE -Dm 644 $(DESTDIR)$(PREFIX)/share/licenses/$(NAME)/LICENSE
-	cd assets/ && find ascii/ -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/share/customfetch/{}" \;
-	find examples/ -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/share/customfetch/{}" \;
+	cd assets/ && find ascii/ -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/share/$(NAME)/{}" \;
+	cd assets/icons && find . -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(ICONPREFIX)/$(NAME)/{}" \;
+	find examples/ -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/share/$(NAME)/{}" \;
 	find locale/ -type f -exec install -Dm 644 "{}" "$(DESTDIR)$(PREFIX)/share/{}" \;
 ifeq ($(GUI_APP), 1)
 	mkdir -p $(DESTDIR)$(APPPREFIX)
@@ -138,13 +140,16 @@ uninstall:
 	rm -f  $(DESTDIR)$(PREFIX)/bin/$(TARGET) $(DESTDIR)$(PREFIX)/bin/cufetch
 	rm -f  $(DESTDIR)$(MANPREFIX)/man1/$(NAME).1
 	rm -f  $(DESTDIR)$(APPPREFIX)/$(NAME).desktop
-	rm -rf $(DESTDIR)$(PREFIX)/share/customfetch/
+	rm -rf $(DESTDIR)$(PREFIX)/share/licenses/$(NAME)/
+	rm -rf $(DESTDIR)$(PREFIX)/share/$(NAME)/
+	rm -rf $(DESTDIR)$(ICONPREFIX)/$(NAME)/
+	find   $(DESTDIR)$(LOCALEDIR) -type f -path "$(DESTDIR)$(LOCALEDIR)/*/LC_MESSAGES/$(NAME).mo" -exec rm -f {} \;
 
 remove: uninstall
 delete: uninstall
 
 updatever:
 	sed -i "s#$(OLDVERSION)#$(VERSION)#g" $(wildcard .github/workflows/*.yml) compile_flags.txt
-	sed -i "s#Project-Id-Version: customfetch $(OLDVERSION)#Project-Id-Version: customfetch $(VERSION)#g" po/*
+	sed -i "s#Project-Id-Version: $(NAME) $(OLDVERSION)#Project-Id-Version: $(NAME) $(VERSION)#g" po/*
 
 .PHONY: $(TARGET) updatever remove uninstall delete dist distclean fmt toml install all locale

cmake_uninstall.cmake.in

@@ -1,20 +1,37 @@
-if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-    message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+message(STATUS "Removing special files")
+file(REMOVE "${CMAKE_INSTALL_PREFIX}/bin/cufetch")  # Symlink
+if(EXISTS "${CMAKE_INSTALL_PREFIX}/bin/customfetch-gui")
+    file(REMOVE "${CMAKE_INSTALL_PREFIX}/bin/customfetch-gui")  # GUI executable
 endif()
 
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
-    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-    if(EXISTS "$ENV{DESTDIR}${file}")
-        exec_program(
-            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-            OUTPUT_VARIABLE rm_out
-            RETURN_VALUE rm_retval)
-        if(NOT "${rm_retval}" STREQUAL 0)
-            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+if(EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+    message(STATUS "Processing install manifest")
+    file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+    string(REGEX REPLACE "\n" ";" files "${files}")
+
+    foreach(file ${files})
+        if(EXISTS "${file}" OR IS_SYMLINK "${file}")
+            message(STATUS "Removing: ${file}")
+            file(REMOVE "${file}")
+            
+            # Remove empty parent directories
+            get_filename_component(dir "${file}" DIRECTORY)
+            while(NOT dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+                file(GLOB contents "${dir}/*")
+                if(NOT contents)
+                    message(STATUS "Removing empty directory: ${dir}")
+                    file(REMOVE_RECURSE "${dir}")
+                    get_filename_component(dir "${dir}" DIRECTORY)
+                else()
+                    break()
+                endif()
+            endwhile()
+        else()
+            message(STATUS "File not found (may be already removed): ${file}")
         endif()
-    else()
-        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-    endif()
-endforeach()
+    endforeach()
+else()
+    message(WARNING "Install manifest not found - some files may remain")
+endif()
+
+message(STATUS "Uninstallation complete")