bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

[Utkarsh Singh]

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

Hi,

Can we add support for PKGBUILD(1) files for Emacs which are used to
install packages from AUR(Arch User Repository).

PKGBUILD are just normal shell script files, so we just have to add
sh mode to it:
diff --git a/lisp/files.el b/lisp/files.el
index 68e883513c..7d01938144 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2723,6 +2723,7 @@ auto-mode-alist
      ("\\.scm\\.[0-9]*\\'" . scheme-mode)
      ("\\.[ckz]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
      ("\\.bash\\'" . sh-mode)
+     ("PKGBUILD$" . sh-mode)
      ("\\(/\\|\\`\\)\\.\\(bash_\\(profile\\|history\\|log\\(in\\|out\\)\\)\\|z?log\\(in\\|out\\)\\)\\'" . sh-mode)
      ("\\(/\\|\\`\\)\\.\\(shrc\\|zshrc\\|m?kshrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
      ("\\(/\\|\\`\\)\\.\\([kz]shenv\\|xinitrc\\|startxrc\\|xsession\\)\\'" . sh-mode)

There is also a special pkgbuild-mode(2) for editing these files which
is also an derivation of sh-mode.

[1]: https://wiki.archlinux.org/index.php/PKGBUILD
[2]: https://github.com/juergenhoetzel/pkgbuild-mode
-- 
Utkarsh Singh

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

bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

[Andreas Schwab]

On Feb 20 2021, Utkarsh Singh wrote:

> diff --git a/lisp/files.el b/lisp/files.el
> index 68e883513c..7d01938144 100644
> --- a/lisp/files.el
> +++ b/lisp/files.el
> @@ -2723,6 +2723,7 @@ auto-mode-alist
>       ("\\.scm\\.[0-9]*\\'" . scheme-mode)
>       ("\\.[ckz]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
>       ("\\.bash\\'" . sh-mode)
> +     ("PKGBUILD$" . sh-mode)

Use "\\'" instead of "$".  Is this supposed to match "fooPKGBUILD"?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

bug#46660: [Andreas Schwab] Re: bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

[Utkarsh Singh]

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

Andreas Schwab <schwab@linux-m68k.org> writes:

> Use "\\'" instead of "$".  Is this supposed to match "fooPKGBUILD"?

Thanks I was unaware of this particular regex!

diff --git a/lisp/files.el b/lisp/files.el
index 68e883513c..393b3472f7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2723,6 +2723,7 @@ auto-mode-alist
("\\.scm\\.[0-9]*\\'" . scheme-mode)
("\\.[ckz]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
("\\.bash\\'" . sh-mode)
+     ("PKGBUILD\\'" . sh-mode)
("\\(/\\|\\`\\)\\.\\(bash_\\(profile\\|history\\|log\\(in\\|out\\)\\)\\|z?log\\(in\\|out\\)\\)\\'" .
sh-mode)
("\\(/\\|\\`\\)\\.\\(shrc\\|zshrc\\|m?kshrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
	("\\(/\\|\\`\\)\\.\\([kz]shenv\\|xinitrc\\|startxrc\\|xsession\\)\\'" . sh-mode)
-- 
Utkarsh Singh

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

bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

[Lars Ingebrigtsen]

Utkarsh Singh <utkarsh190601@gmail.com> writes:

> Andreas Schwab <schwab@linux-m68k.org> writes:
>
>> Use "\\'" instead of "$".  Is this supposed to match "fooPKGBUILD"?
>
> Thanks I was unaware of this particular regex!

[...]

> +     ("PKGBUILD\\'" . sh-mode)

Thanks, but this will still match "fooPKGBUILD".  Is that the intention,
or are these files called only "PKGBUILD" without any prefix?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#46660: [Utkarsh Singh] Re: bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

[Utkarsh Singh]

> Thanks, but this will still match "fooPKGBUILD".  Is that the intention,
> or are these files called only "PKGBUILD" without any prefix?

Yes, these file are only called PKGBUILD without any post-fix.

For prefix shouldn't they match the file path for ex:
'/home/user/emacs/PKGBUILD' or is file path ignored in this case?
-- 
Utkarsh Singh

bug#46660: [Utkarsh Singh] Re: bug#46660: [PATCH] 28.0.50; Support for PKGBUILD files on Arch Linux

[Lars Ingebrigtsen]

Utkarsh Singh <utkarsh190601@gmail.com> writes:

>> Thanks, but this will still match "fooPKGBUILD".  Is that the intention,
>> or are these files called only "PKGBUILD" without any prefix?
>
> Yes, these file are only called PKGBUILD without any post-fix.
>
> For prefix shouldn't they match the file path for ex:
> '/home/user/emacs/PKGBUILD' or is file path ignored in this case?

I interpret this to mean that the files are called "PKGBUILD", with no
prefix, and I've committed your patch (with a change to match exactly
that) to Emacs 28.  (The fix is to add a "/" to the start of the regexp,
since we're matching on the entire file name.)

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no