From 9e4c38867b74603947f2173fa578b9f35e9fab58 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Sun, 4 Oct 2020 21:40:26 +0200
Subject: [PATCH] [ref] completion: gen completion script via clap
---
release/arch/arm/build-arm.sh | 2 +-
release/arch/linux/build-lin.sh | 2 +-
.../{duniter_completion.bash => duniter_js_completion.bash} | 4 ++--
release/extra/debian/package/DEBIAN/postinst | 3 +++
rust-bins/duniter-launcher/src/main.rs | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
rename release/extra/completion/{duniter_completion.bash => duniter_js_completion.bash} (97%)
diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh
index 0c28b41fa..fccffd5f5 100755
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
@@ -79,7 +79,7 @@ chmod 755 duniter-${ARCH}/DEBIAN/post*
chmod 755 duniter-${ARCH}/DEBIAN/pre*
sed -i "s/Version:.*/Version:$DUNITER_DEB_VER/g" duniter-${ARCH}/DEBIAN/control
echo "Extra..."
-mv duniter/extra/completion/duniter_completion.bash duniter-${ARCH}/etc/bash_completion.d/duniter_completion.bash
+mv duniter/extra/completion/duniter_js_completion.bash duniter-${ARCH}/etc/bash_completion.d/duniter_js_completion.bash
rm -rf duniter/extra
echo "Zipping..."
cd duniter
diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh
index d72647d69..df2621266 100755
--- a/release/arch/linux/build-lin.sh
+++ b/release/arch/linux/build-lin.sh
@@ -45,7 +45,7 @@ build_extra_server() {
mkdir -p "${1}/lib/systemd/system" || exit 1
mv "${RELEASES}/server_/extra/systemd/duniter.service" "${1}/lib/systemd/system" || exit 1
mkdir -p "${1}/etc/bash_completion.d/" || exit 1
- mv "${RELEASES}/server_/extra/completion/duniter_completion.bash" "${1}/etc/bash_completion.d/duniter_completion.bash" || exit 1
+ mv "${RELEASES}/server_/extra/completion/duniter_js_completion.bash" "${1}/etc/bash_completion.d/duniter_js_completion.bash" || exit 1
}
# Debian package building.
diff --git a/release/extra/completion/duniter_completion.bash b/release/extra/completion/duniter_js_completion.bash
similarity index 97%
rename from release/extra/completion/duniter_completion.bash
rename to release/extra/completion/duniter_js_completion.bash
index d6572f2af..68d7f7c17 100644
--- a/release/extra/completion/duniter_completion.bash
+++ b/release/extra/completion/duniter_js_completion.bash
@@ -149,7 +149,7 @@ DUNITER_WS2P_ARGS="list-prefered list-privileged list-nodes show-conf"
DUNITER_REACHING_CLEAR_EP_ARGS="clear tor none"
-_duniter_completion()
+_duniter_js_completion()
{
local cur prev base
COMPREPLY=()
@@ -198,4 +198,4 @@ _duniter_completion()
return 0
}
-complete -F _duniter_completion duniter
+complete -F _duniter_js_completion duniter_js
diff --git a/release/extra/debian/package/DEBIAN/postinst b/release/extra/debian/package/DEBIAN/postinst
index 930075ae9..915f1c583 100755
--- a/release/extra/debian/package/DEBIAN/postinst
+++ b/release/extra/debian/package/DEBIAN/postinst
@@ -30,6 +30,9 @@ if [[ -d $DUN_SOURCES/node ]]; then
ln -s $DUN_SOURCES/bin/duniter /usr/bin/duniter -f
ln -s $DUN_SOURCES/bin/duniter_js /usr/bin/duniter_js -f
cd $DUN_SOURCES
+ # Generate bash completion script
+ mkdir -p "/etc/bash_completion.d/"
+ bin/duniter completions bash > /etc/bash_completion.d/duniter_completion.bash
cd node/bin/
ln -s ../lib/node_modules/npm/bin/npm-cli.js ./npm -f
# Add duniter user for service
diff --git a/rust-bins/duniter-launcher/src/main.rs b/rust-bins/duniter-launcher/src/main.rs
index bdc246701..7cfe68857 100644
--- a/rust-bins/duniter-launcher/src/main.rs
+++ b/rust-bins/duniter-launcher/src/main.rs
@@ -145,7 +145,7 @@ enum DuniterCommand {
/// Generate tab-completion script for your shell
#[structopt(display_order(13))]
Completions {
- #[structopt(case_insensitive(true), possible_values = &["BASH, FISH, ZSH"])]
+ #[structopt(case_insensitive(true))]
shell: Shell,
},
}
--
GitLab