parallel: CPU detection bug on Android fixed.

This commit is contained in:
Ole Tange 2019-10-25 00:47:38 +02:00
parent 1ba05d3bb7
commit 95ecf18d0c
4 changed files with 6 additions and 6 deletions

View file

@ -23,7 +23,7 @@
use strict; use strict;
use Getopt::Long; use Getopt::Long;
$Global::progname="niceload"; $Global::progname="niceload";
$Global::version = 20191022; $Global::version = 20191023;
Getopt::Long::Configure("bundling","require_order"); Getopt::Long::Configure("bundling","require_order");
get_options_from_array(\@ARGV) || die_usage(); get_options_from_array(\@ARGV) || die_usage();
if($opt::version) { if($opt::version) {

View file

@ -2071,7 +2071,7 @@ sub check_invalid_option_combinations() {
sub init_globals() { sub init_globals() {
# Defaults: # Defaults:
$Global::version = 20191022; $Global::version = 20191023;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$::name = "GNU Parallel"; $::name = "GNU Parallel";
$Global::infinity = 2**31; $Global::infinity = 2**31;
@ -7281,7 +7281,7 @@ sub sct_android($) {
# 'threads' => #threads # 'threads' => #threads
# 'active' => #taskset_threads } # 'active' => #taskset_threads }
# Use GNU/Linux # Use GNU/Linux
return sct_gnu_linux(@_); return sct_gnu_linux($_[0]);
} }
sub sct_freebsd($) { sub sct_freebsd($) {

View file

@ -1599,7 +1599,7 @@ Overrides an earlier B<--keep-order> (e.g. if set in
B<~/.parallel/config>). B<~/.parallel/config>).
=item B<--nice> I<niceness> (beta testing) =item B<--nice> I<niceness>
Run the command at this niceness. Run the command at this niceness.
@ -2191,7 +2191,7 @@ Only supported in B<Ash, Bash, Dash, Ksh, Sh, and Zsh>.
See also B<--env>, B<--record-env>. See also B<--env>, B<--record-env>.
=item B<--shard> I<shardexpr> (beta testing) =item B<--shard> I<shardexpr>
Use I<shardexpr> as shard key and shard input to the jobs. Use I<shardexpr> as shard key and shard input to the jobs.

View file

@ -574,7 +574,7 @@ $Global::Initfile && unlink $Global::Initfile;
exit ($err); exit ($err);
sub parse_options { sub parse_options {
$Global::version = 20191022; $Global::version = 20191023;
$Global::progname = 'sql'; $Global::progname = 'sql';
# This must be done first as this may exec myself # This must be done first as this may exec myself