diff --git a/src/env_parallel.ash b/src/env_parallel.ash index 043265ba..d4b636e4 100755 --- a/src/env_parallel.ash +++ b/src/env_parallel.ash @@ -233,9 +233,11 @@ env_parallel() { else unset PARALLEL_ENV; _error "Your environment is too big." - _error "You can try 2 different approaches:" - _error "1. Use --env and only mention the names to copy." - _error "2. Try running this in a clean environment once:" + _error "You can try 3 different approaches:" + _error "1. Run 'env_parallel --session' before you set" + _error " variables or define functions." + _error "2. Use --env and only mention the names to copy." + _error "3. Try running this in a clean environment once:" _error " env_parallel --record-env" _error " And then use '--env _'" _error "For details see: man env_parallel" diff --git a/src/env_parallel.bash b/src/env_parallel.bash index f3e8941a..263e4840 100755 --- a/src/env_parallel.bash +++ b/src/env_parallel.bash @@ -263,9 +263,11 @@ env_parallel() { else unset PARALLEL_ENV; _error "Your environment is too big." - _error "You can try 2 different approaches:" - _error "1. Use --env and only mention the names to copy." - _error "2. Try running this in a clean environment once:" + _error "You can try 3 different approaches:" + _error "1. Run 'env_parallel --session' before you set" + _error " variables or define functions." + _error "2. Use --env and only mention the names to copy." + _error "3. Try running this in a clean environment once:" _error " env_parallel --record-env" _error " And then use '--env _'" _error "For details see: man env_parallel" diff --git a/src/env_parallel.dash b/src/env_parallel.dash index 1114ecac..bbefd8b2 100755 --- a/src/env_parallel.dash +++ b/src/env_parallel.dash @@ -233,9 +233,11 @@ env_parallel() { else unset PARALLEL_ENV; _error "Your environment is too big." - _error "You can try 2 different approaches:" - _error "1. Use --env and only mention the names to copy." - _error "2. Try running this in a clean environment once:" + _error "You can try 3 different approaches:" + _error "1. Run 'env_parallel --session' before you set" + _error " variables or define functions." + _error "2. Use --env and only mention the names to copy." + _error "3. Try running this in a clean environment once:" _error " env_parallel --record-env" _error " And then use '--env _'" _error "For details see: man env_parallel" diff --git a/src/env_parallel.ksh b/src/env_parallel.ksh index 6bd28c9c..bf7733ee 100755 --- a/src/env_parallel.ksh +++ b/src/env_parallel.ksh @@ -213,9 +213,11 @@ env_parallel() { else unset PARALLEL_ENV; _error "Your environment is too big." - _error "You can try 2 different approaches:" - _error "1. Use --env and only mention the names to copy." - _error "2. Try running this in a clean environment once:" + _error "You can try 3 different approaches:" + _error "1. Run 'env_parallel --session' before you set" + _error " variables or define functions." + _error "2. Use --env and only mention the names to copy." + _error "3. Try running this in a clean environment once:" _error " env_parallel --record-env" _error " And then use '--env _'" _error "For details see: man env_parallel" diff --git a/src/env_parallel.sh b/src/env_parallel.sh index a9bfed54..36d02010 100755 --- a/src/env_parallel.sh +++ b/src/env_parallel.sh @@ -234,9 +234,11 @@ env_parallel() { else unset PARALLEL_ENV; _error "Your environment is too big." - _error "You can try 2 different approaches:" - _error "1. Use --env and only mention the names to copy." - _error "2. Try running this in a clean environment once:" + _error "You can try 3 different approaches:" + _error "1. Run 'env_parallel --session' before you set" + _error " variables or define functions." + _error "2. Use --env and only mention the names to copy." + _error "3. Try running this in a clean environment once:" _error " env_parallel --record-env" _error " And then use '--env _'" _error "For details see: man env_parallel" diff --git a/src/env_parallel.zsh b/src/env_parallel.zsh index a353fafe..dc57d41a 100755 --- a/src/env_parallel.zsh +++ b/src/env_parallel.zsh @@ -212,9 +212,11 @@ env_parallel() { else unset PARALLEL_ENV; _error "Your environment is too big." - _error "You can try 2 different approaches:" - _error "1. Use --env and only mention the names to copy." - _error "2. Try running this in a clean environment once:" + _error "You can try 3 different approaches:" + _error "1. Run 'env_parallel --session' before you set" + _error " variables or define functions." + _error "2. Use --env and only mention the names to copy." + _error "3. Try running this in a clean environment once:" _error " env_parallel --record-env" _error " And then use '--env _'" _error "For details see: man env_parallel" diff --git a/src/niceload b/src/niceload index f6280305..18ae83e2 100755 --- a/src/niceload +++ b/src/niceload @@ -24,7 +24,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20180522; +$Global::version = 20180524; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index 98062d6f..22b93fc8 100755 --- a/src/parallel +++ b/src/parallel @@ -1450,7 +1450,7 @@ sub check_invalid_option_combinations { sub init_globals { # Defaults: - $Global::version = 20180522; + $Global::version = 20180524; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/src/parallel.pod b/src/parallel.pod index e95e9e1f..c5f6c600 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -1596,9 +1596,9 @@ it to the command. Only used with B<--pipe>. -=item B<--results> I +=item B<--results> I (alpha testing) -=item B<--res> I +=item B<--res> I (alpha testing) Save the output into files. @@ -2035,7 +2035,7 @@ Use the replacement string I instead of B<{#}> for job sequence number. -=item B<--session> (alpha testing) +=item B<--session> (beta testing) Record names in current environment in B<$PARALLEL_IGNORED_NAMES> and exit. Only used with B. Aliases, functions, and @@ -2330,7 +2330,7 @@ Silent. The job to be run will not be printed. This is the default. Can be reversed with B<-v>. -=item B<--tty> (alpha testing) +=item B<--tty> (beta testing) Open terminal tty. If GNU B is used for starting a program that accesses the tty (such as an interactive program) then this diff --git a/src/sql b/src/sql index 0427cc17..220c28b4 100755 --- a/src/sql +++ b/src/sql @@ -576,7 +576,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20180522; + $Global::version = 20180524; $Global::progname = 'sql'; # This must be done first as this may exec myself