From 7f2df584007b3c48d427aa636fa6919bb04d2d91 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Tue, 14 Apr 2020 20:01:06 +0000 Subject: Drop a lot of parenthesis --- autobuild.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/autobuild.rb b/autobuild.rb index 9471278..a58ca97 100755 --- a/autobuild.rb +++ b/autobuild.rb @@ -48,16 +48,16 @@ def find_attributes(build_dir) next end name = $1 - if name =~ /^((bwbasic)|(yabasic)|(mono-basic))$/ then + if name =~ /^(bwbasic|yabasic|mono-basic)$/ then attr[:lang_basic] = true end if name =~ /^mono$/ then attr[:lang_dotnet] = true end - if name =~ /^(erlang)-compiler$/ then + if name =~ /^erlang-compiler$/ then attr[:lang_erlang] = true end - if name =~ /^gcc-g(fortran)$/ then + if name =~ /^gcc-gfortran$/ then attr[:lang_fortran] = true end if name =~ /^golang$/ then @@ -69,10 +69,10 @@ def find_attributes(build_dir) if name =~ /^ghc$/ then attr[:lang_haskell] = true end - if name =~ /^(java)|(gcc-java)/ then + if name =~ /^(java|gcc-java)/ then attr[:lang_java] = true end - if name =~ /^c(lisp)-devel$/ then + if name =~ /^clisp-devel$/ then attr[:lang_lisp] = true end if name =~ /^lib(64)?lua-devel$/ then @@ -84,7 +84,7 @@ def find_attributes(build_dir) if name =~ /^(ocaml)-compiler$/ then attr[:lang_ocaml] = true end - if name =~ /^(nodejs)|(uglify-js)|(slimit)|(yuicompressor)$/ then + if name =~ /^(nodejs|uglify-js|slimit|yuicompressor)$/ then attr[:lang_javascript] = true end if name =~ /^fpc(-src)?$/ then @@ -97,17 +97,17 @@ def find_attributes(build_dir) # too many false positives: # perl-libintl-perl # perl-WWW-Curl (required by openssl) - if name !~ /^((perl)|(perl-base)|(perl-Config-IniFiles)|(perl-Exporter-Tiny)|(perl-File-Slurp)|(perl-File-Sync)|(perl-Filesys-Df)|(perl-IO-stringy)|(perl-JSON)|(perl-libintl-perl)|(perl-List-MoreUtils)|(perl-List-MoreUtils-XS)|(perl-Locale-gettext)|(perl-MDK-Common)|(perl-MDV-Distribconf)|(perl-MDV-Packdrakeng)|(perl-Module-ScanDeps)|(perl-srpm-macros)|(perl-Time-ZoneInfo)|(perl-URPM)|(perl-WWW-Curl)|(perl-XML-LibXML)|(perl-XML-NamespaceSupport)|(perl-XML-SAX)|(perl-XML-SAX-Base)|(perl-YAML)|(perl-YAML-Tiny))$/ then + if name !~ /^(perl|perl-base|perl-Config-IniFiles|perl-Exporter-Tiny|perl-File-Slurp|perl-File-Sync|perl-Filesys-Df|perl-IO-stringy|perl-JSON|perl-libintl-perl|perl-List-MoreUtils|perl-List-MoreUtils-XS|perl-Locale-gettext|perl-MDK-Common|perl-MDV-Distribconf|perl-MDV-Packdrakeng|perl-Module-ScanDeps|perl-srpm-macros|perl-Time-ZoneInfo|perl-URPM|perl-WWW-Curl|perl-XML-LibXML|perl-XML-NamespaceSupport|perl-XML-SAX|perl-XML-SAX-Base|perl-YAML|perl-YAML-Tiny)$/ then attr[:lang_perl] = true end end - if name =~ /^((php)-devel)|(lib(64)?php_common)/ then + if name =~ /^(php-devel|lib(64)?php_common)/ then attr[:lang_php] = true end - if name =~ /^((python3?-setuptools)|(lib(64)?python3?-devel))$/ then + if name =~ /^(python3?-setuptools|lib(64)?python3?-devel)$/ then attr[:lang_python] = true end - if name =~ /^((ruby)-devel)|(lib(64)?ruby[0-9])/ then + if name =~ /^(ruby-devel|lib(64)?ruby[0-9])/ then attr[:lang_ruby] = true end if name =~ /^tcl$/ then -- cgit v1.2.1