From 986c0e08db39ea981392d1f293b25084cbd9f076 Mon Sep 17 00:00:00 2001
From: ful1e5 <24286590+ful1e5@users.noreply.github.com>
Date: Fri, 19 Nov 2021 15:33:51 +0530
Subject: [PATCH] enhance: used `THEME_PREFIX` variable in make commands

---
 CHANGELOG.md |  4 ++++
 Makefile     | 37 +++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aad58eda..0b3b4f2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Bibata Zebra](https://github.com/ful1e5/Bibata-Zebra-Cursor) link added inside README.md
 - [Bibata Bee](https://github.com/ful1e5/Bibata-Bee-Cursor) link added inside README.md
 
+### Changed
+
+- used `THEME_PREFIX` variable in make commands
+
 ## [Bibata v1.1.2] - 12 Jul 2021
 
 ### Added
diff --git a/Makefile b/Makefile
index 30d3afbf..c69e8e00 100644
--- a/Makefile
+++ b/Makefile
@@ -42,40 +42,45 @@ build_original: bitmaps
 
 # Installation
 .ONESHELL:
-SHELL:=/bin/bash
+SHELL := /bin/bash
+THEME_PREFIX = Bibata
 
-src = ./themes/Bibata-*
+src = ./themes/$(THEME_PREFIX)-*
 local := ~/.icons
-local_dest := $(local)/Bibata-*
+local_dest := $(local)/$(THEME_PREFIX)-*
 
 root := /usr/share/icons
-root_dest := $(root)/Bibata-*
+root_dest := $(root)/$(THEME_PREFIX)-*
 
 install: themes
 	@if [[ $EUID -ne 0 ]]; then
-		@echo "> Installing 'Bibata' cursors inside $(local)/..."
+		@echo "> Installing '$(THEME_PREFIX)' cursors inside $(local)/..."
 		@mkdir -p $(local)
 		@cp -r $(src) $(local)/ && echo "> Installed!"
 	@else
-		@echo "> Installing 'Bibata' cursors inside $(root)/..."
+		@echo "> Installing '$(THEME_PREFIX)' cursors inside $(root)/..."
 		@mkdir -p $(root)
 		@sudo cp -r $(src) $(root)/ && echo "> Installed!"
 	@fi
 
 uninstall:
 	@if [[ $EUID -ne 0 ]]; then
-		@echo "> Removing 'Bibata' cursors from '$(local)'..."
+		@echo "> Removing '$(THEME_PREFIX)' cursors from '$(local)'..."
 		@rm -rf $(local_dest)
 	@else
-		@echo "> Removing 'Bibata' cursors from '$(root)'..."
+		@echo "> Removing '$(THEME_PREFIX)' cursors from '$(root)'..."
 		@sudo rm -rf $(root_dest)
 	@fi
 
 reinstall: uninstall install
 
+
 # generates binaries
 THEMES = Amber Classic Ice
 BIN_DIR = ../bin
+
+modern = $(THEME_PREFIX)-Modern
+original = $(THEME_PREFIX)-Original
 prepare: bitmaps themes
 	# Bitmaps
 	@rm -rf bin && mkdir bin
@@ -84,17 +89,17 @@ prepare: bitmaps themes
 	#
 	# Bibata-Modern
 	#
-	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/Bibata-Modern-$(theme).tar.gz Bibata-Modern-$(theme);)
-	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/Bibata-Modern-$(theme)-Windows.zip Bibata-Modern-$(theme)-Windows;)
-	@tar -czvf $(BIN_DIR)/Bibata-Modern.tar.gz Bibata-Modern-Amber Bibata-Modern-Classic Bibata-Modern-Ice
-	@zip -r $(BIN_DIR)/Bibata-Modern-Windows.zip Bibata-Modern-Amber-Windows Bibata-Modern-Classic-Windows Bibata-Modern-Ice-Windows
+	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/$(modern)-$(theme).tar.gz $(modern)-$(theme);)
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(modern)-$(theme)-Windows.zip $(modern)-$(theme)-Windows;)
+	@tar -czvf $(BIN_DIR)/$(modern).tar.gz $(modern)-Amber $(modern)-Classic $(modern)-Ice
+	@zip -r $(BIN_DIR)/$(modern)-Windows.zip $(modern)-Amber-Windows $(modern)-Classic-Windows $(modern)-Ice-Windows
 	#
 	# Bibata-Original
 	#
-	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/Bibata-Original-$(theme).tar.gz Bibata-Original-$(theme);)
-	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/Bibata-Original-$(theme)-Windows.zip Bibata-Original-$(theme)-Windows;)
-	@tar -czvf $(BIN_DIR)/Bibata-Original.tar.gz Bibata-Original-Amber Bibata-Original-Classic Bibata-Original-Ice
-	@zip -r $(BIN_DIR)/Bibata-Original-Windows.zip Bibata-Original-Amber-Windows Bibata-Original-Classic-Windows Bibata-Original-Ice-Windows
+	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/$(original)-$(theme).tar.gz $(original)-$(theme);)
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(original)-$(theme)-Windows.zip $(original)-$(theme)-Windows;)
+	@tar -czvf $(BIN_DIR)/$(original).tar.gz $(original)-Amber $(original)-Classic $(original)-Ice
+	@zip -r $(BIN_DIR)/$(original)-Windows.zip $(original)-Amber-Windows $(original)-Classic-Windows $(original)-Ice-Windows
 	#
 	# Bibata.tar.gz
 	#