From 21b4d1ad516d4d1ec5ec544cf7b4e1307ff12e1d Mon Sep 17 00:00:00 2001 From: Topoetry Date: Tue, 9 Dec 2025 23:57:51 +0100 Subject: [PATCH 1/3] added a trailing / to that path If not present certain install treat it as a file instead. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c6c60d84..8a97396f 100644 --- a/Makefile +++ b/Makefile @@ -210,6 +210,6 @@ pure_install: # Install Translations install -m 644 locale/*.qm $(DEST_RAY)/locale/ - install -m 644 $(PATCHBAY_DIR)/locale/*.qm $(DEST_RAY)/$(PATCHBAY_DIR)/locale + install -m 644 $(PATCHBAY_DIR)/locale/*.qm $(DEST_RAY)/$(PATCHBAY_DIR)/locale/ From 8947ff24d7142c757aa36cdc30fe7e27e6cc9084 Mon Sep 17 00:00:00 2001 From: Topoetry Date: Wed, 10 Dec 2025 01:40:34 +0100 Subject: [PATCH 2/3] =?UTF-8?q?oops=20c'=C3=A9tait=20plut=C3=B4t=20un=20so?= =?UTF-8?q?uci=20avec=20le=20wildcard=20*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8a97396f..b977871a 100644 --- a/Makefile +++ b/Makefile @@ -209,7 +209,7 @@ pure_install: install -m 755 data/bin/ray_control $(DESTDIR)$(PREFIX)/bin/ # Install Translations - install -m 644 locale/*.qm $(DEST_RAY)/locale/ - install -m 644 $(PATCHBAY_DIR)/locale/*.qm $(DEST_RAY)/$(PATCHBAY_DIR)/locale/ + install -m 644 -t $(DEST_RAY)/locale/ locale/*.qm + install -m 644 -t $(DEST_RAY)/$(PATCHBAY_DIR)/locale/ $(PATCHBAY_DIR)/locale/*.qm From f67be95393b00e89c0109b30e9aba0c2a404e7bc Mon Sep 17 00:00:00 2001 From: Topoetry Date: Wed, 10 Dec 2025 02:14:32 +0100 Subject: [PATCH 3/3] moved bash-completion to the >=2.9 bash-completion directory --- Makefile | 6 +++--- src/completion/ray_completion.sh | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b977871a..a8718df9 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ pure_install: install -d $(DEST_RAY)/$(_DIR)/ install -d $(DEST_RAY)/$(PATCHBAY_DIR)/locale/ install -d $(DESTDIR)/etc/xdg/raysession/client_templates/ - install -d $(DESTDIR)/etc/bash_completion.d + install -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions/ # Install icons for sz in $(ICON_SIZES);do \ @@ -168,9 +168,9 @@ pure_install: cp -r data $(DEST_RAY)/ # Copy completion script - cp -r src/completion/ray_completion.sh $(DESTDIR)/etc/bash_completion.d/ + cp -r src/completion/ray_completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/raysession sed -i "s|XXX_PYCOMPLETION_XXX|$(DEST_RAY)/src/completion|" \ - $(DESTDIR)/etc/bash_completion.d/ray_completion.sh + $(DESTDIR)$(PREFIX)/share/bash-completion/completions/raysession # Copy patchbay themes, manual and lib cp -r HoustonPatchbay/themes $(DEST_RAY)/$(PATCHBAY_DIR)/ diff --git a/src/completion/ray_completion.sh b/src/completion/ray_completion.sh index 354725b3..dda07c92 100755 --- a/src/completion/ray_completion.sh +++ b/src/completion/ray_completion.sh @@ -1,11 +1,8 @@ -#!/usr/bin/env bash - -PY_FILE=XXX_PYCOMPLETION_XXX - -ray_complete() { +_ray_complete() { + PY_FILE=XXX_PYCOMPLETION_XXX IFS=$'\n' COMPREPLY=($(compgen -W "$(python3 "$PY_FILE" "${COMP_WORDS[@]}")" -- "${COMP_WORDS[COMP_CWORD]}")) unset IFS } -complete -F ray_complete ray_control +complete -F _ray_complete ray_control