aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2026-08-21 03:01:55 -0400
committerB. Watson <urchlay@slackware.uk>2026-08-21 03:01:55 -0400
commit2b3e9b84ad566f3c45d2628b6f9114ba70751b25 (patch)
tree91b0fbee13f820e3eecd4ee53e1f059d16a9ea47
parentb7d71f2e342fa3bbcfa1afa957cfeea4584bc9b7 (diff)
downloadsbo-maintainer-tools-2b3e9b84ad566f3c45d2628b6f9114ba70751b25.tar.gz
Fix gtk-update-icon-cache check (maybe; needs testing).
-rw-r--r--NEWS2
-rwxr-xr-xsbolint6
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8d25ab6..b87e09c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ New in 0.9.8:
- Python hashed URL check now catches pypi.python.org, too.
- Python hashed URL check demoted to a note (too many of them in
the repo currently).
+- Icon cache check now catches gtk-update-icon-cache in doinst.sh,
+ even if it's not called by its full path.
New in 0.9.7.1:
===============
diff --git a/sbolint b/sbolint
index d994a8d..07d8289 100755
--- a/sbolint
+++ b/sbolint
@@ -1848,12 +1848,14 @@ sub check_doinst {
if(!$pp_defined) {
log_error("$file:$lineno: 'preserve_perms' function used, but not defined.");
}
- } elsif(m,-e\s+(\/)?usr/share/icons/[^/]*/icon-theme\.cache,) {
+ } elsif(m,-e\s+(\/)?usr/share/icons/\S*icon-theme\.cache,) {
+ #warn "got here $lineno: $_";
if(defined $1) {
log_error("$file:$lineno: bad icon cache check (/usr/, should be usr/)");
}
$icon_theme_check = $lineno;
- } elsif(m,usr/bin/gtk-update-icon-cache.*usr/share/icons,) {
+ } elsif(m,^[^[#]*gtk-update-icon-cache,) {
+ #warn "got here $lineno: $_";
if(!$icon_theme_check) {
log_error("$file:$lineno: icon cache created unconditionally!");
}