flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2025-10-18 00:56:47 +03:00
parent 55dd723e97
commit af61bd1ed2
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/viewer-build.yml vendored
View File

@ -49,8 +49,6 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }} if: ${{ matrix.os == 'macos-latest' }}
run: | run: |
brew install gnu-sed brew install gnu-sed
ln -s /usr/local/bin/{g,}sed
echo "PATH=/usr/local/bin:$PATH" >> $GITHUB_ENV
#- name: Env #- name: Env

23
Viewer/Makefile
View File

@ -294,6 +294,7 @@ else
ifeq ($(shell uname -s),Darwin) ifeq ($(shell uname -s),Darwin)
TARGET_OS ?= darwin TARGET_OS ?= darwin
NW_OS ?= osx NW_OS ?= osx
SED = gsed
endif endif
# set arch... # set arch...
@ -341,6 +342,8 @@ RM += -r
MD = @mkdir -p MD = @mkdir -p
SED ?= sed
#********************************************************************** #**********************************************************************
# Paths and lists... # Paths and lists...
@ -405,7 +408,7 @@ PATCHES := $(REQUREJS)
#********************************************************************** #**********************************************************************
# dependencies to check... # dependencies to check...
# #
DEPENDENCIES_HELP = sed grep printf DEPENDENCIES_HELP = $(SED) grep printf
DEPENDENCIES_WEB = node npm npx DEPENDENCIES_WEB = node npm npx
DEPENDENCIES = $(DEPENDENCIES_WEB) \ DEPENDENCIES = $(DEPENDENCIES_WEB) \
@ -432,23 +435,23 @@ help:
help_lines=(`grep -Fh "##" $(MAKEFILE_LIST) \ help_lines=(`grep -Fh "##" $(MAKEFILE_LIST) \
| grep -Fv grep \ | grep -Fv grep \
| grep -Fv '"##' \ | grep -Fv '"##' \
| sed -e 's/\\$$//'`); \ | $(SED) -e 's/\\$$//'`); \
for help_line in $${help_lines[@]}; do \ for help_line in $${help_lines[@]}; do \
IFS=$$'#' ; \ IFS=$$'#' ; \
if [ -z "$${help_line/'#'#[#-]*/}" ] ; then \ if [ -z "$${help_line/'#'#[#-]*/}" ] ; then \
echo ; \ echo ; \
echo "$${help_line}" \ echo "$${help_line}" \
| sed -e 's/#\+[- ]*//' \ | $(SED) -e 's/#\+[- ]*//' \
-e 's/\s*\(...\|---\)\s*$$/:/'; \ -e 's/\s*\(...\|---\)\s*$$/:/'; \
elif [ -z "$${help_line/'#'*/}" ] ; then \ elif [ -z "$${help_line/'#'*/}" ] ; then \
echo "$${help_line}" \ echo "$${help_line}" \
| sed 's/#\+[- ]*//' ; \ | $(SED) 's/#\+[- ]*//' ; \
else \ else \
help_split=($$help_line) ; \ help_split=($$help_line) ; \
help_command=`echo $${help_split[0]} \ help_command=`echo $${help_split[0]} \
| sed -e 's/^ *//' -e 's/ *$$//'` ; \ | $(SED) -e 's/^ *//' -e 's/ *$$//'` ; \
help_info=`echo $${help_split[2]} \ help_info=`echo $${help_split[2]} \
| sed -e 's/^ *//' -e 's/ *$$//'` ; \ | $(SED) -e 's/^ *//' -e 's/ *$$//'` ; \
printf " %-30s %s\n" $$help_command $$help_info ; \ printf " %-30s %s\n" $$help_command $$help_info ; \
fi ; \ fi ; \
done done
@ -733,7 +736,7 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \
# XXX revise $LAUNCHER -- should it be absolute or relative and when??? # XXX revise $LAUNCHER -- should it be absolute or relative and when???
%: %.tpl package.json %: %.tpl package.json
cat $< \ cat $< \
| sed -e 's/\$$APP_NAME/$(APP_NAME)/' \ | $(SED) -e 's/\$$APP_NAME/$(APP_NAME)/' \
-e 's/\$$COMMENT/$(subst \/,\/,$(COMMENT))/' \ -e 's/\$$COMMENT/$(subst \/,\/,$(COMMENT))/' \
-e 's/\$$CATEGORIES/$(subst \/,\/,$(CATEGORIES))/' \ -e 's/\$$CATEGORIES/$(subst \/,\/,$(CATEGORIES))/' \
-e 's/\$$VERSION/$(APP_VERSION)/' \ -e 's/\$$VERSION/$(APP_VERSION)/' \
@ -824,7 +827,7 @@ $(REQUREJS)$(BACKUP_EXT): $(NODE_DIR)
# HACK: for some reason requirejs breaks if we do not do this (see: NOTES) # HACK: for some reason requirejs breaks if we do not do this (see: NOTES)
cp -f $(REQUREJS){,$(BACKUP_EXT)} cp -f $(REQUREJS){,$(BACKUP_EXT)}
cat $(REQUREJS)$(BACKUP_EXT) \ cat $(REQUREJS)$(BACKUP_EXT) \
| sed 's/^\(#!\/\)/\/\/\1/' \ | $(SED) 's/^\(#!\/\)/\/\/\1/' \
> $(REQUREJS) > $(REQUREJS)
.PHONY: patched-requirejs .PHONY: patched-requirejs
@ -874,7 +877,7 @@ $(TARGET_DIR)/$(ELECTRON_DIST):
$(BUILD_DIR)/app.asar: $(PACK_FULL) $(BUILD_DIR)/app.asar: $(PACK_FULL)
# update package.json to start electron... # update package.json to start electron...
cd "$(BUILD_DIR)/$(APP_NAME)/" ; \ cd "$(BUILD_DIR)/$(APP_NAME)/" ; \
sed -i 's/"index.html"/"e.js"/g' package.json $(SED) -i 's/"index.html"/"e.js"/g' package.json
# remove electron from the dist... # remove electron from the dist...
rm -rf "$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/electron" rm -rf "$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/electron"
cd "$(BUILD_DIR)" ; \ cd "$(BUILD_DIR)" ; \
@ -925,7 +928,7 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \
$(call zipDelFrom,"$(BUILD_DIR)",$@.tmp,"version") $(call zipDelFrom,"$(BUILD_DIR)",$@.tmp,"version")
# rename electron stuff... # rename electron stuff...
# # XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes... # # XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes...
# | sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' # | $(SED) 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/'
unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron
# rename app... # rename app...
# # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes... # # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes...