diff options
| author | Eric Wong <e@80x24.org> | 2022-01-20 18:34:16 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2022-01-21 19:54:41 +0000 |
| commit | c3b34b1693e7b35841d87dae0dce8ccecebe9008 (patch) | |
| tree | d83d7e9f368a4817f6682165b47148ca27b1998b /bin | |
| parent | f0da7e664140cb1000d22db5509168b3d82b728b (diff) | |
| download | dtas-c3b34b1693e7b35841d87dae0dce8ccecebe9008.tar.gz | |
This allows us to jettison a bunch of compatibility code since we've started using Etc.nprocessors and String#- (uminus) in more places. The Ruby core team doesn't support <= 2.5, even.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/dtas-partstats | 12 | ||||
| -rwxr-xr-x | bin/dtas-readahead | 3 | ||||
| -rwxr-xr-x | bin/dtas-sinkedit | 3 | ||||
| -rwxr-xr-x | bin/dtas-sourceedit | 3 |
4 files changed, 6 insertions, 15 deletions
diff --git a/bin/dtas-partstats b/bin/dtas-partstats index 884a6d1..6a0c9d4 100755 --- a/bin/dtas-partstats +++ b/bin/dtas-partstats @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org> +# Copyright (C) all contributors <dtas-all@nongnu.org> # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt> # frozen_string_literal: true # TODO @@ -8,17 +8,11 @@ # - configurable output formatting # - Sequel/SQLite support require 'dtas/partstats' +require 'etc' infile = ARGV[0] or abort "usage: #$0 INFILE" ps = DTAS::PartStats.new(infile) -def nproc - require 'etc' - Etc.nprocessors -rescue NoMethodError - `nproc 2>/dev/null || echo 2`.to_i -end - -opts = { jobs: nproc } +opts = { jobs: Etc.nprocessors } stats = ps.run(opts) headers = ps.key_idx.to_a diff --git a/bin/dtas-readahead b/bin/dtas-readahead index 3eedd86..a1971bd 100755 --- a/bin/dtas-readahead +++ b/bin/dtas-readahead @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# Copyright (C) 2015-2020 all contributors <dtas-all@nongnu.org> +# Copyright (C) all contributors <dtas-all@nongnu.org> # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt> # frozen_string_literal: true # @@ -18,7 +18,6 @@ require 'dtas/unix_client' require 'dtas/process' include DTAS::Process -include DTAS::SpawnFix trap(:CHLD) { DTAS::Process.reaper {} } trap(:INT) { exit(0) } trap(:TERM) { exit(0) } diff --git a/bin/dtas-sinkedit b/bin/dtas-sinkedit index 3393aac..8f96a97 100755 --- a/bin/dtas-sinkedit +++ b/bin/dtas-sinkedit @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org> +# Copyright (C) all contributors <dtas-all@nongnu.org> # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt> # frozen_string_literal: true require 'optparse' @@ -68,7 +68,6 @@ if st_in.file? || st_in.pipe? buf = $stdin.read commit_update.call(buf) else - include DTAS::SpawnFix tmp = tmpyaml tmp_path = tmp.path do_update = lambda { commit_update.call(File.read(tmp_path)) } diff --git a/bin/dtas-sourceedit b/bin/dtas-sourceedit index 23362c2..e6603bf 100755 --- a/bin/dtas-sourceedit +++ b/bin/dtas-sourceedit @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org> +# Copyright (C) all contributors <dtas-all@nongnu.org> # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt> # frozen_string_literal: true require 'optparse' @@ -55,7 +55,6 @@ if st_in.file? || st_in.pipe? buf = $stdin.read commit_update.call(buf) else - include DTAS::SpawnFix tmp = tmpyaml tmp_path = tmp.path do_update = lambda { commit_update.call(File.read(tmp_path)) } |