[bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'.

[bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'.

[Oleg Pykhalov]

* etc/completion/bash/guix (_guix_is_dash_L): Replace with
‘_guix_is_dash_L_or_m’.
(_guix_complete): Add this.
---
 etc/completion/bash/guix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
index 6b84193db..286c4f1c5 100644
--- a/etc/completion/bash/guix
+++ b/etc/completion/bash/guix
@@ -97,9 +97,10 @@ _guix_is_removing ()
     $result
 }
 
-_guix_is_dash_L ()
+_guix_is_dash_L_or_m ()
 {
-    [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \
+    comp_words_minus_1="${COMP_WORDS[$COMP_CWORD - 1]}"
+    [ "$comp_words_minus_1" = "-L" ] || [ "$comp_words_minus_1" = "-m" ] \
 	|| { case "${COMP_WORDS[$COMP_CWORD]}" in
 		 --load-path=*) true;;
 		 *)             false;;
@@ -149,7 +150,7 @@ _guix_complete ()
 	*)
 	    if _guix_is_command "package"
 	    then
-		if _guix_is_dash_L
+		if _guix_is_dash_L_or_m
 		then
 		    _guix_complete_file
 		elif _guix_is_removing
-- 
2.16.1

[bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]

Oleg Pykhalov <go.wigust@gmail.com> writes:

> * etc/completion/bash/guix (_guix_is_dash_L): Replace with
> ‘_guix_is_dash_L_or_m’.
> (_guix_complete): Add this.

[...]

> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
> index 6b84193db..286c4f1c5 100644
> --- a/etc/completion/bash/guix
> +++ b/etc/completion/bash/guix
> @@ -97,9 +97,10 @@ _guix_is_removing ()
>      $result
>  }
>  
> -_guix_is_dash_L ()
> +_guix_is_dash_L_or_m ()
>  {
> -    [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \
> +    comp_words_minus_1="${COMP_WORDS[$COMP_CWORD - 1]}"
> +    [ "$comp_words_minus_1" = "-L" ] || [ "$comp_words_minus_1" = "-m" ] \
>  	|| { case "${COMP_WORDS[$COMP_CWORD]}" in
>  		 --load-path=*) true;;
>  		 *)             false;;

I think this fails to account for the long form "--manifest".  Perhaps
it's better to add a new "_guix_is_dash_m" and use

"if _guix_is_dash_L || _guix_is_dash_m"

below.  WDYT?

> @@ -149,7 +150,7 @@ _guix_complete ()
>  	*)
>  	    if _guix_is_command "package"
>  	    then
> -		if _guix_is_dash_L
> +		if _guix_is_dash_L_or_m
>  		then
>  		    _guix_complete_file
>  		elif _guix_is_removing
> -- 
> 2.16.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'.

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 1261 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Oleg Pykhalov <go.wigust@gmail.com> writes:
>
>> * etc/completion/bash/guix (_guix_is_dash_L): Replace with
>> ‘_guix_is_dash_L_or_m’.
>> (_guix_complete): Add this.
>
> [...]
>
>> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
>> index 6b84193db..286c4f1c5 100644
>> --- a/etc/completion/bash/guix
>> +++ b/etc/completion/bash/guix
>> @@ -97,9 +97,10 @@ _guix_is_removing ()
>>      $result
>>  }
>>  
>> -_guix_is_dash_L ()
>> +_guix_is_dash_L_or_m ()
>>  {
>> -    [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \
>> +    comp_words_minus_1="${COMP_WORDS[$COMP_CWORD - 1]}"
>> +    [ "$comp_words_minus_1" = "-L" ] || [ "$comp_words_minus_1" = "-m" ] \
>>  	|| { case "${COMP_WORDS[$COMP_CWORD]}" in
>>  		 --load-path=*) true;;
>>  		 *)             false;;
>
> I think this fails to account for the long form "--manifest".  Perhaps
> it's better to add a new "_guix_is_dash_m" and use
>
> "if _guix_is_dash_L || _guix_is_dash_m"
>
> below.  WDYT?

Nice catch!  Thanks.

But I don't know how to implement a file completion for ‘--manifest=’.
‘--load-path=’ doesn't have a file completion too.  Only completion for
equal sign before.

Oleg.


[-- Attachment #1.2: [PATCH] bash completion: Complete files names after 'guix package --]
[-- Type: text/x-patch, Size: 1285 bytes --]

From b6d104ec1b3df46a409c989bf12e19c30a920c00 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 17 Feb 2018 12:05:26 +0300
Subject: [PATCH] bash completion: Complete files names after 'guix package
 -m'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* etc/completion/bash/guix (_guix_is_dash_L): Replace with
‘_guix_is_dash_L_or_m’.
(_guix_complete): Add this.
---
 etc/completion/bash/guix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
index 6b84193db..70430c5c9 100644
--- a/etc/completion/bash/guix
+++ b/etc/completion/bash/guix
@@ -106,6 +106,15 @@ _guix_is_dash_L ()
 	     esac }
 }
 
+_guix_is_dash_m ()
+{
+    [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-m" ] \
+	|| { case "${COMP_WORDS[$COMP_CWORD]}" in
+		 --manifest=*) true;;
+		 *)            false;;
+	     esac }
+}
+
 _guix_complete_file ()
 {
     # Let Readline complete file names.
@@ -149,7 +158,7 @@ _guix_complete ()
 	*)
 	    if _guix_is_command "package"
 	    then
-		if _guix_is_dash_L
+		if _guix_is_dash_L || _guix_is_dash_m
 		then
 		    _guix_complete_file
 		elif _guix_is_removing
-- 
2.16.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]

Oleg Pykhalov <go.wigust@gmail.com> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Oleg Pykhalov <go.wigust@gmail.com> writes:
>>
>>> * etc/completion/bash/guix (_guix_is_dash_L): Replace with
>>> ‘_guix_is_dash_L_or_m’.
>>> (_guix_complete): Add this.
>>
>> [...]
>>
>>> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
>>> index 6b84193db..286c4f1c5 100644
>>> --- a/etc/completion/bash/guix
>>> +++ b/etc/completion/bash/guix
>>> @@ -97,9 +97,10 @@ _guix_is_removing ()
>>>      $result
>>>  }
>>>  
>>> -_guix_is_dash_L ()
>>> +_guix_is_dash_L_or_m ()
>>>  {
>>> -    [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \
>>> +    comp_words_minus_1="${COMP_WORDS[$COMP_CWORD - 1]}"
>>> +    [ "$comp_words_minus_1" = "-L" ] || [ "$comp_words_minus_1" = "-m" ] \
>>>  	|| { case "${COMP_WORDS[$COMP_CWORD]}" in
>>>  		 --load-path=*) true;;
>>>  		 *)             false;;
>>
>> I think this fails to account for the long form "--manifest".  Perhaps
>> it's better to add a new "_guix_is_dash_m" and use
>>
>> "if _guix_is_dash_L || _guix_is_dash_m"
>>
>> below.  WDYT?
>
> Nice catch!  Thanks.
>
> But I don't know how to implement a file completion for ‘--manifest=’.
> ‘--load-path=’ doesn't have a file completion too.  Only completion for
> equal sign before.

Oh, OK.  That's another issue I guess.  The patch below LGTM, but the
commit message needs adjusting ;-)

Thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#30495: [PATCH] bash completion: Complete files names after 'guix package -m'.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Oleg Pykhalov <go.wigust@gmail.com> writes:
>
>> Marius Bakke <mbakke@fastmail.com> writes:
>>
>>> Oleg Pykhalov <go.wigust@gmail.com> writes:
>>>
>>>> * etc/completion/bash/guix (_guix_is_dash_L): Replace with
>>>> ‘_guix_is_dash_L_or_m’.
>>>> (_guix_complete): Add this.
>>>
>>> [...]
>>>
>>>> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix
>>>> index 6b84193db..286c4f1c5 100644
>>>> --- a/etc/completion/bash/guix
>>>> +++ b/etc/completion/bash/guix
>>>> @@ -97,9 +97,10 @@ _guix_is_removing ()
>>>>      $result
>>>>  }
>>>>  
>>>> -_guix_is_dash_L ()
>>>> +_guix_is_dash_L_or_m ()
>>>>  {
>>>> -    [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \
>>>> +    comp_words_minus_1="${COMP_WORDS[$COMP_CWORD - 1]}"
>>>> +    [ "$comp_words_minus_1" = "-L" ] || [ "$comp_words_minus_1" = "-m" ] \
>>>>  	|| { case "${COMP_WORDS[$COMP_CWORD]}" in
>>>>  		 --load-path=*) true;;
>>>>  		 *)             false;;
>>>
>>> I think this fails to account for the long form "--manifest".  Perhaps
>>> it's better to add a new "_guix_is_dash_m" and use
>>>
>>> "if _guix_is_dash_L || _guix_is_dash_m"
>>>
>>> below.  WDYT?
>>
>> Nice catch!  Thanks.
>>
>> But I don't know how to implement a file completion for ‘--manifest=’.
>> ‘--load-path=’ doesn't have a file completion too.  Only completion for
>> equal sign before.
>
> Oh, OK.  That's another issue I guess.  The patch below LGTM, but the
> commit message needs adjusting ;-)

Ouch, thank you for reminding.

Pushed as f5f916792c7069a22d95c5b7c68bcf3bbb86e451

I'll close the bug report.

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]