Skip to content

Commit f07f9bc

Browse files
authored
Merge branch 'weechat:main' into colorize_regex
2 parents 3543415 + 349fc8f commit f07f9bc

13 files changed

Lines changed: 818 additions & 789 deletions

File tree

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels: bug
66

77
---
88

9-
<!-- Please do not report any security issue here, see file Contributing.md -->
9+
<!-- Please do not report any security issue here, see file CONTRIBUTING.md -->
1010

1111
## Script / WeeChat
1212

.github/pull_request_template.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424

2525
<!-- To fill only if you are adding a new script -->
2626

27-
<!-- Please validate and check each item with "[x]" (see file Contributing.md) -->
27+
<!-- Please validate and check each item with "[x]" (see file CONTRIBUTING.md) -->
2828

2929
- [ ] Single commit, single file added
3030
- [ ] Commit message: `New script name.py: short description…`
3131
- [ ] No similar script already exists
3232
- [ ] Name: max 32 chars, only lower case letters, digits and underscores
3333
- [ ] Unique name, does not already exist in repository
3434
- [ ] No shebang on the first line
35-
- [ ] Comment in script with name/pseudo, e-mail and license
35+
- [ ] Comment in script with name/pseudo, e-mail and license using [SPDX](https://spdx.dev/) tags (see [Contributing guide](https://github.com/weechat/scripts/blob/main/CONTRIBUTING.md#copyright-and-license))
3636
- [ ] Only English in code/comments
3737
- [ ] Pure WeeChat API used, no extra API
3838
- [ ] Function `hook_url`, `hook_process` or `hook_process_hashtable` is used for any blocking call
@@ -43,7 +43,7 @@
4343

4444
<!-- To fill only if you are updating an existing script -->
4545

46-
<!-- Please validate and check each item with "[x]" (see file Contributing.md) -->
46+
<!-- Please validate and check each item with "[x]" (see file CONTRIBUTING.md) -->
4747

4848
- [ ] Author has been contacted
4949
- [ ] Single commit, single file added
@@ -56,7 +56,7 @@
5656

5757
<!-- To fill only if you are deleting an existing script -->
5858

59-
<!-- Please validate and check each item with "[x]" (see file Contributing.md) -->
59+
<!-- Please validate and check each item with "[x]" (see file CONTRIBUTING.md) -->
6060

6161
- [ ] Author has been contacted
6262
- [ ] Single commit, single file deleted

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2021-2025 Sébastien Helleu <flashcode@flashtux.org>
2+
#
3+
# SPDX-License-Identifier: GPL-3.0-or-later
4+
15
name: CI
26

37
on:

Contributing.md renamed to CONTRIBUTING.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Thank you for your help!
1919

2020
New scripts are added with pull requests against master branch of this repository, using the pull request template called `Add script`.
2121

22+
### Guidelines
23+
2224
**Important:** please fill the pull request template and follow **all** these rules, otherwise your new script will be rejected:
2325

2426
- pull request:
@@ -34,8 +36,8 @@ New scripts are added with pull requests against master branch of this repositor
3436
- do **NOT** use the word "weechat" in the script name: for example prefer `notify.py` to `weechat_notify.py` (the script is only for WeeChat)
3537
- script content:
3638
- do **NOT** use a shebang on the first line (like `#!/usr/bin/perl`), this is not needed
37-
- write a comment at the beginning with your name (or pseudo), your e-mail and the chosen license (which must be free)
38-
- consider using [Semantic versioning ](https://semver.org/) (recommended, not mandatory); only digits and dots are allowed in version
39+
- write a comment at the beginning with your name (or pseudo), your e-mail and the chosen license, which must be free (see [Copyright and license](#copyright-and-license))
40+
- consider using [Semantic versioning](https://semver.org/) (recommended, not mandatory); only digits and dots are allowed in version
3941
- use only English for code and comments
4042
- do **NOT** use an extra API between WeeChat and your script (like Ruby gem "WeeChat"), use the standard WeeChat API only
4143
- use function [hook_url](https://weechat.org/files/doc/stable/weechat_plugin_api.en.html#_hook_url) (WeeChat ≥ 4.1.0), [hook_process](https://weechat.org/files/doc/stable/weechat_plugin_api.en.html#_hook_process) or [hook_process_hashtable](https://weechat.org/files/doc/stable/weechat_plugin_api.en.html#_hook_process_hashtable) if your script is doing something blocking (like fetching URL), to not block WeeChat
@@ -44,6 +46,22 @@ New scripts are added with pull requests against master branch of this repositor
4446

4547
Your script is automatically checked in CI, see [Automatic checks on scripts](#automatic-checks-on-scripts).
4648

49+
### Copyright and license
50+
51+
The copyright and license must be present in header, using [SPDX](https://spdx.dev/) tags, see the [list of licenses](https://spdx.org/licenses/).
52+
53+
Example of header in a Python script:
54+
55+
<!-- REUSE-IgnoreStart -->
56+
57+
```python
58+
# SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
59+
#
60+
# SPDX-License-Identifier: GPL-3.0-or-later
61+
```
62+
63+
<!-- REUSE-IgnoreEnd -->
64+
4765
## Updating a script
4866

4967
### Contacting the author

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#
2-
# Copyright (C) 2021-2022 Sébastien Helleu <flashcode@flashtux.org>
2+
# SPDX-FileCopyrightText: 2021-2025 Sébastien Helleu <flashcode@flashtux.org>
3+
#
4+
# SPDX-License-Identifier: GPL-3.0-or-later
35
#
46
# This program is free software; you can redistribute it and/or modify
57
# it under the terms of the GNU General Public License as published by
@@ -23,7 +25,7 @@ all: check
2325

2426
# this target will be removed once the ignored scripts are fixed
2527
partial-check:
26-
"$(CHECKER)" --ignore-files autosort.py,gateway_rename.scm,ircrypt.py,latex_unicode.py,menu.pl --recursive .
28+
"$(CHECKER)" --ignore-files gateway_rename.scm --recursive .
2729

2830
check:
2931
"$(CHECKER)" --recursive .

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ They are also displayed on [https://weechat.org/scripts/](https://weechat.org/sc
88

99
## Contributing
1010

11-
To add/update a script or report an issue, see the [Contributing guide](Contributing.md).
11+
To add/update a script or report an issue, see the [Contributing guide](CONTRIBUTING.md).

perl/atcomplete.pl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Copyright 2015 by David A. Golden. All rights reserved.
1+
# SPDX-FileCopyrightText: 2015-2016 David A. Golden <xdg@xdg.me>
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
24
#
35
# Licensed under the Apache License, Version 2.0 (the "License"); you may
46
# not use this file except in compliance with the License. You may obtain
@@ -28,7 +30,7 @@
2830
use strict;
2931
use warnings;
3032
my $SCRIPT_NAME = "atcomplete";
31-
my $VERSION = "0.001";
33+
my $VERSION = "0.002";
3234

3335
my %options_default = (
3436
'enabled' => ['on', 'enable completion of nicks starting with @'],

perl/menu.pl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
$INC{'Encode/ConfigLocal.pm'}=1;
33
require Encode;
44

5-
# menu.pl is written by Nei <anti.teamidiot.de>
6-
# and licensed under the under GNU General Public License v3
7-
# or any later version
5+
# SPDX-FileCopyrightText: 2011-2013 Nei <anti.teamidiot.de>
6+
#
7+
# SPDX-License-Identifier: GPL-3.0-or-later
88

99
# to read the following docs, you can use "perldoc menu.pl"
1010

@@ -251,7 +251,7 @@ =head1 FUNCTION DESCRIPTION
251251
=cut
252252

253253
use constant SCRIPT_NAME => 'menu';
254-
our $VERSION = '1.0';
254+
our $VERSION = '1.0.1';
255255

256256
#$$$ autoloaded{
257257
BEGIN { { package WeeP::Tie::hash_accessor;
@@ -661,6 +661,7 @@ =head1 FUNCTION DESCRIPTION
661661
} @fields
662662
} };
663663
}
664+
# this calls the infolist_free function
664665
$infptr->free;
665666
!wantarray && @infolist ? ($$I->{o} && @infolist == 1) ? $infolist[0] : \@infolist : @infolist
666667
}

perl/sysinfo.pl

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#
2-
# Copyright (c) 2002-2005 David Rudie
3-
# All rights reserved.
2+
# SPDX-FileCopyrightText: 2011-2019 Nils Görs <weechatter@arcor.de>
3+
# SPDX-FileCopyrightText: 2002-2005 David Rudie <d.rudie@gmail.com>
4+
# SPDX-FileCopyrightText: 2003-2006 Travis Morgan <imbezol@criticaldamage.com>
5+
#
6+
# SPDX-License-Identifier: BSD-2-Clause
47
#
58
# Redistribution and use in source and binary forms, with or without
69
# modification, are permitted provided that the following conditions
@@ -23,9 +26,6 @@
2326
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2427
# SUCH DAMAGE.
2528
#
26-
# Several additions and fixes to this script were contributed by Travis
27-
# Morgan and therefore are Copyright (c) 2003-2006 Travis Morgan
28-
#
2929
# If you notice any bugs including spacing issues, wrong detection of hardware,
3030
# obvious features missing, etc, we both want to hear about them. If you make
3131
# this script work on other operating systems and/or architectures please send
@@ -37,15 +37,16 @@
3737
#
3838
# You can also reach Travis in #crd on efnet.
3939
#
40-
# ported to WeeChat (http://www.weechat.org/) by Nils Görs. Copyright
41-
# (c) 2011-2019 Nils Görs
40+
# ported to WeeChat (http://www.weechat.org/) by Nils Görs.
4241
#
42+
# 2025-04-22: 1.2.1 Sébastien Helleu <flashcode@flashtux.org>
43+
# : fix script license
4344
# 2019-05-13: 1.2 nils_2 (freenode@nils_2)
44-
# : make script compatible with kernel 5.x
45+
# : make script compatible with kernel 5.x
4546
# 2019-03-17: 1.1 nils_2 (freenode@nils_2)
46-
# : fix: warning isn't numeric in subtraction
47+
# : fix: warning isn't numeric in subtraction
4748
# 2016-03-23: 1.0 nils_2 (freenode@nils_2)
48-
# : fix: problem with armv7l Processor (eg cubietruck)
49+
# : fix: problem with armv7l Processor (eg cubietruck)
4950
# 2015-05-16: 0.9 Keridos <fuffzehn@gmail.com>
5051
# add compatibility with linux kernel 4.x
5152
# 2015-02-15: 0.8 nils_2 (freenode@nils_2)
@@ -58,8 +59,8 @@
5859
# : based on sysinfo 2.81.21
5960
# : bug with "armv5tel" in sysinfo 2.81.21 fixed (Version bumped to 2.81.22 and sent to maintainer)
6061
# 2012-01-07: 0.4 welwood08
61-
# : Fix distro+version for Ubuntu LTS
62-
# : version bumped to 0.4 and copyright status changed
62+
# : Fix distro+version for Ubuntu LTS
63+
# : version bumped to 0.4 and copyright status changed
6364
# 2011-10-01: 0.3 nils_2 <weechatter@arcor.de>
6465
# : bar_item added (idea by Banton)
6566
# 2011-09-27: 0.2 nils_2 <weechatter@arcor.de>
@@ -76,9 +77,9 @@
7677
use strict;
7778

7879
my $SCRIPT_NAME = "sysinfo";
79-
my $SCRIPT_VERSION = "1.2";
80+
my $SCRIPT_VERSION = "1.2.1";
8081
my $SCRIPT_DESCR = "provides a system info command";
81-
my $SCRIPT_LICENSE = "GPL3";
82+
my $SCRIPT_LICENSE = "BSD-2-Clause";
8283
my $SCRIPT_AUTHOR = "Nils Görs <weechatter\@arcor.de>";
8384

8485
# Set up the arrays and variables first.

python/btc_ticker.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#!/usr/bin/env python
2-
# coding=utf-8
3-
4-
# Copyright (c) 2014-2018 Eugene Ciurana (pr3d4t0r)
5-
# All rights reserved.
1+
# SPDX-FileCopyrightText: 2014-2018 Eugene Ciurana (pr3d4t0r) <eugenex@cime.net>
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
64
#
75
# Version - see _VERSION global
86
#
@@ -57,7 +55,7 @@
5755

5856
VALID_CRYPTO_CURRENCIES = [ DEFAULT_CRYPTO_CURRENCY, 'eth', 'bch', 'xrp', 'xem', 'ltc', 'dash', 'neo', 'etc', ]
5957
VALID_FIAT_CURRENCIES = [ DEFAULT_FIAT_CURRENCY, 'eur', 'rur', ]
60-
_VERSION = '2.1.0'
58+
_VERSION = '2.1.1'
6159

6260
COMMAND_NICK = 'tick'
6361

0 commit comments

Comments
 (0)