From 2fd6ec969f15b63cf523fc3ed4ce5a28cf312dbf Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 30 Jun 2022 15:28:36 +0300 Subject: [PATCH] more tweaking... Signed-off-by: Alex A. Naanou --- Viewer/App.desktop.tpl | 4 ++-- Viewer/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Viewer/App.desktop.tpl b/Viewer/App.desktop.tpl index f492c1b7..c1f832d5 100644 --- a/Viewer/App.desktop.tpl +++ b/Viewer/App.desktop.tpl @@ -1,7 +1,7 @@ [Desktop Entry] Name=$APP_NAME -Comment=Image sorting and editing -Categories=Photography;Graphics;Database;Viewer; +Comment=$COMMENT +Categories=$CATEGORIES Exec=$LAUNCHER Icon=$ICON_PATH Terminal=false diff --git a/Viewer/Makefile b/Viewer/Makefile index 45fcd16b..987470e7 100644 --- a/Viewer/Makefile +++ b/Viewer/Makefile @@ -168,6 +168,9 @@ SHELL := bash APP_NAME ?= ImageGrid.Viewer +COMMENT ?= Image sorting and editing +CATEGORIES ?= Photography;Graphics;Database;Viewer; + DEVEL_PATH := $(shell pwd) # install mode... @@ -720,12 +723,15 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \ # basic templates... +# XXX revise $LAUNCHER -- should it be absolute or relative and when??? %: %.tpl package.json cat $< \ + | sed 's/\$$APP_NAME/$(APP_NAME)/' \ + | sed 's/\$$COMMENT/$(subst \/,\/,$(COMMENT))/' \ + | sed 's/\$$CATEGORIES/$(subst \/,\/,$(CATEGORIES))/' \ | sed 's/\$$VERSION/$(APP_VERSION)/' \ | sed 's/\$$BUILD/$(DATE)/' \ | sed 's/\$$COMMIT/$(COMMIT)/' \ - | sed 's/\$$APP_NAME/$(APP_NAME)/' \ | sed 's#\$$APP_PATH#$(APP_PATH)#' \ | sed 's#\$$ICON_PATH#$(ICON_PATH)#' \ | sed 's#\$$LAUNCHER#$(INSTALL_PATH)/$(APP_LAUNCHER)#' \