From c92b116ae2ce11ace68e321667359a32697c1ab8 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 11 Jul 2023 13:31:12 +0200 Subject: [PATCH] Install headers and desktop file without executable permissions. Improve desktop file: Terminal=true implies lauching a terminal window, no need to call x-terminal-emulator in Exec. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ff071d6c..7a0af927 100644 --- a/Makefile +++ b/Makefile @@ -708,13 +708,13 @@ $(LIBDEV_PATH)/$(SHARED_LIB_NAME_SHORT): $(LIBDEV_PATH) @ln -sf $(SHARED_LIB_NAME_SO) $@ $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent - @install -p $< $@ + @install -p -m 644 $< $@ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent - @install -p $< $@ + @install -p -m 644 $< $@ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent - @install -p $< $@ + @install -p -m 644 $< $@ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) @install -p $< $@ @@ -725,8 +725,8 @@ ifndef ANY_MSYS ## scheme handler $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop - @install -p -D $< $@ - @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@ + @install -p -m 644 -D $< $@ + @echo "Exec=sh -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; \\\\\$$SHELL\"" >> $@ ## Xsession $(XSESSION_PATH)/Xsession.d/91oidc-agent: $(CONFDIR)/Xsession/91oidc-agent -- 2.41.0