tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-24 15:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: Fixed bug #65736: Default values for XDG_CONFIG_HOME XDG_CACHE_HOME

Browse source
This commit is contained in:
Ole Tange 2024-06-15 12:22:31 +02:00
parent 2f2fba268f
commit e57686278e
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/release_new_version
View file

@ -273,7 +273,7 @@ from:tange@gnu.org
to:parallel@gnu.org, bug-parallel@gnu.org to:parallel@gnu.org, bug-parallel@gnu.org
stable-bcc: Jesse Alama <jessealama@fastmail.fm> stable-bcc: Jesse Alama <jessealama@fastmail.fm>
Subject: GNU Parallel 20240622 ('34 counts/(Raisi-IRAN preæsentdt)/spurlock(supersize)') released Subject: GNU Parallel 20240622 ('Versailles/34 counts/(Raisi-IRAN preæsentdt)/spurlock(supersize)') released
GNU Parallel 20240122 ('Frederik X') has been released. It is available for download at: lbry://@GnuParallel:4 GNU Parallel 20240122 ('Frederik X') has been released. It is available for download at: lbry://@GnuParallel:4

8
src/parallel
View file

@ -2931,7 +2931,7 @@ sub init_globals() {
eval { File::Path::mkpath($ENV{'PARALLEL_HOME'}); }; eval { File::Path::mkpath($ENV{'PARALLEL_HOME'}); };
} }
# $xdg_config_home is needed to make env_parallel.fish stop complaining # $xdg_config_home is needed to make env_parallel.fish stop complaining
my $xdg_config_home = $ENV{'XDG_CONFIG_HOME'}; my $xdg_config_home = $ENV{'XDG_CONFIG_HOME'} || $ENV{'HOME'} . "/.config";
# Use the first config dir that exists from: # Use the first config dir that exists from:
# $PARALLEL_HOME # $PARALLEL_HOME
# $XDG_CONFIG_HOME/parallel # $XDG_CONFIG_HOME/parallel
@ -2957,11 +2957,11 @@ sub init_globals() {
# $PARALLEL_HOME # $PARALLEL_HOME
# $XDG_CACHE_HOME/parallel # $XDG_CACHE_HOME/parallel
# Keep only dirs that exist # Keep only dirs that exist
my $xdg_cache_home = $ENV{'XDG_CACHE_HOME'} || $ENV{'HOME'} . "/.cache";
@Global::cache_dirs = (grep { -d $_ } @Global::cache_dirs = (grep { -d $_ }
$ENV{'PARALLEL_HOME'}, $ENV{'PARALLEL_HOME'},
$ENV{'XDG_CACHE_HOME'}."/parallel"); $xdg_cache_home."/parallel");
$Global::cache_dir = $Global::cache_dirs[0] || $Global::cache_dir = $Global::cache_dirs[0] || $ENV{'HOME'} . "/.parallel";
$ENV{'HOME'} . "/.parallel";
Job::init_color(); Job::init_color();
} }

5
testsuite/tests-to-run/parallel-local-30s.sh
View file

@ -322,6 +322,9 @@ par_internal_quote_char() {
::: -X -q -Xq -k | ::: -X -q -Xq -k |
# Upgrade old bash error to new bash error # Upgrade old bash error to new bash error
perl -pe 's/No such file or directory/Invalid or incomplete multibyte or wide character/g' perl -pe 's/No such file or directory/Invalid or incomplete multibyte or wide character/g'
# Bug in Perl's SQL::CSV module cannot handle dir with \n
TMPDIR=/tmp
TMPDIR=$(mktemp -d)
cd "$TMPDIR" cd "$TMPDIR"
echo "Compare old quote char csv" echo "Compare old quote char csv"
parallel-20231222 --sqlmaster csv:///./oldformat.csv echo "$(printf "\257\257 \177\177")" ::: 1 2 3 parallel-20231222 --sqlmaster csv:///./oldformat.csv echo "$(printf "\257\257 \177\177")" ::: 1 2 3
@ -332,6 +335,8 @@ par_internal_quote_char() {
stdout parallel -k --sqlworker csv:///./newformat.csv echo "$(printf "\257\257 \177\177")" ::: 1 2 3 | stdout parallel -k --sqlworker csv:///./newformat.csv echo "$(printf "\257\257 \177\177")" ::: 1 2 3 |
od -t x1z > new.out od -t x1z > new.out
diff old.out new.out && echo OK diff old.out new.out && echo OK
rm -f old.out new.out oldformat.csv newformat.csv
rmdir "$TMPDIR"
} }
par_groupby() { par_groupby() {

9
testsuite/wanted-results/parallel-local-30s
View file

@ -2843,9 +2843,12 @@ par_internal_quote_char <<> -Xq /usr/bin/bash: line 1: $'echo \177<\177<\177
par_internal_quote_char <<> -k <<> par_internal_quote_char <<> -k <<>
par_internal_quote_char <<> -k <<> <<> par_internal_quote_char <<> -k <<> <<>
par_internal_quote_char <<> -k <<><<> par_internal_quote_char <<> -k <<><<>
par_internal_quote_char <<> -k /usr/bin/bash: line 1: : No such file or directory par_internal_quote_char <<> -k /usr/bin/bash: line 1: : Invalid or incomplete multibyte or wide character
par_internal_quote_char <<> -k /usr/bin/bash: line 1: : No such file or directory par_internal_quote_char <<> -k /usr/bin/bash: line 1: : Invalid or incomplete multibyte or wide character
par_internal_quote_char <<> -k /usr/bin/bash: line 1: : No such file or directory par_internal_quote_char <<> -k /usr/bin/bash: line 1: : Invalid or incomplete multibyte or wide character
par_internal_quote_char Compare old quote char csv
par_internal_quote_char with new quote char csv (must be the same)
par_internal_quote_char OK
par_max_length_len_128k ### BUG: The length for -X is not close to max (131072) par_max_length_len_128k ### BUG: The length for -X is not close to max (131072)
par_max_length_len_128k 63xxx par_max_length_len_128k 63xxx
par_max_length_len_128k 63xxx par_max_length_len_128k 63xxx