From b4c9fbfe6da7ceb49dec5fa77740c2141b1b1ac6 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 6 Sep 2025 08:24:37 +0200 Subject: [PATCH 1/3] fix: use local flag See https://git.coopcloud.tech/toolshed/abra/issues/648 --- cli/run.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cli/run.go b/cli/run.go index f96bb4bf..621f596f 100644 --- a/cli/run.go +++ b/cli/run.go @@ -217,12 +217,10 @@ Config: i18n.G("help for abra"), ) - rootCmd.PersistentFlags().BoolVarP( + rootCmd.Flags().BoolVarP( &internal.Version, i18n.G("version"), - // FIXME: temporary workaround for #648 - // i18n.G("v"), - "", + i18n.G("v"), false, i18n.G("version for abra"), ) -- 2.49.0 From 560d6090137be6b117aaeeaf561387306c4aa623 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 6 Sep 2025 08:26:50 +0200 Subject: [PATCH 2/3] test: ensure autocomplete output works See https://git.coopcloud.tech/toolshed/abra/issues/649 --- tests/integration/autocomplete.bats | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 tests/integration/autocomplete.bats diff --git a/tests/integration/autocomplete.bats b/tests/integration/autocomplete.bats new file mode 100644 index 00000000..48af6f0b --- /dev/null +++ b/tests/integration/autocomplete.bats @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +setup_file(){ + load "$PWD/tests/integration/helpers/common" + _common_setup +} + +setup(){ + load "$PWD/tests/integration/helpers/common" + _common_setup +} + +@test "autocomplete output works" { + run $ABRA autocomplete bash + assert_success + + run $ABRA autocomplete fish + assert_success + + run $ABRA autocomplete zsh + assert_success + + run $ABRA autocomplete powershell + assert_success +} -- 2.49.0 From 02add8c3ef05fc0659da8648469d3202d3ebe8cd Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 6 Sep 2025 08:28:53 +0200 Subject: [PATCH 3/3] chore: make i18n --- pkg/i18n/locales/abra.pot | 6 +++--- pkg/i18n/locales/es.mo | Bin 10651 -> 10641 bytes pkg/i18n/locales/es.po | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/i18n/locales/abra.pot b/pkg/i18n/locales/abra.pot index 0dbd4072..84f27786 100644 --- a/pkg/i18n/locales/abra.pot +++ b/pkg/i18n/locales/abra.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL\n" - "POT-Creation-Date: 2025-09-05 17:09-0400\n" + "POT-Creation-Date: 2025-09-06 08:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5374,7 +5374,7 @@ msgstr "" #. translators: `abra recipe versions` aliases. use a comma separated list of aliases #. with no spaces in between -#: ./cli/app/backup.go:311 ./cli/app/restore.go:122 ./cli/recipe/version.go:19 ./cli/server/prune.go:107 +#: ./cli/app/backup.go:311 ./cli/app/restore.go:122 ./cli/recipe/version.go:19 ./cli/run.go:223 ./cli/server/prune.go:107 msgid "v" msgstr "" @@ -5421,7 +5421,7 @@ msgstr "" msgid "version : %s, " msgstr "" -#: ./cli/run.go:227 +#: ./cli/run.go:225 msgid "version for abra" msgstr "" diff --git a/pkg/i18n/locales/es.mo b/pkg/i18n/locales/es.mo index 6310ac2052e1b83d41d82adb384f86c6688db5cf..75ff3f9441f3b00e88fdf951427970c5f8c758b0 100644 GIT binary patch delta 1056 zcmXZbT}V@57{KvI!UhWr8{0H3kCv4mTgN#+wlpTK4`HUHVS!;M8#Nf4Z7ZmdLl8kw zK`cn>A|ePW0>ewYDU6^jh`@{P5(I*SSA>dvtzjoqel9 z_cpuoZ15eu6#3?=gs#wdFXB5#luN#K*V^ zKh%o-|Hc`(ffRp$MJFv5nhcJn4IE$KS2{rK_ zf%B+m=A(1p#eQkrg!=q3Cv+EEsV|E(wBR>1u;j!I993PJ9@JBP6m{e`Q4`Ez9G8*f zBh{>{J|9GVE`eJ343bi=parI`K9$V`;#MIUH9}^nD_}+fX4o)$qaEQklb<_bp+VUVxgFch7xy&bjx#Gq>XR+wsuWdA?-!NhJR>Ne*b#I3~Bs0E&Q^UL0RK?Q4>Z$cZ7VjJGZYJ7(sxQYj{u`;)j zQEVlCfSUhPWmaT6gTLMbQ&-Z*2fB({ z@Hs|t6)kKxBAs|X%b2>tx`uk7huBDcSz@3Cf1$xbT2$i()SIzUyLt$9=XX&PEMO3q zk@k@a?p4>fp{^T5EqoD4E!VLW7rgm5Sf_up6$ZMq{Dxd})S~`9`cV^|MJ;e;F;S2z z%EnVpGLb%K>I1Ijrc7Ymog8lP#YR%@M8=Aw#}dQVp~\n" "Language-Team: Spanish