mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

h5fuse.sh fix for summit. (#2841)

Browse Source 
* updated directory locations
This commit is contained in:
Scot Breitenfeld 2023-04-28 07:45:29 -05:00 committed by GitHub
parent b5ecb0af6d
commit 8e8d98319b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testpar/t_subfiling_vfd.c
View File

@ -1858,7 +1858,7 @@ test_subfiling_h5fuse(void)
args[0] = HDstrdup("env");
args[1] = HDstrdup("sh");
args[2] = HDstrdup("h5fuse.sh");
args[3] = HDstrdup("-f");
args[3] = HDstrdup("-q -f");
args[4] = tmp_filename;
args[5] = NULL;

16
utils/subfiling_vfd/h5fuse.sh.in
View File

@ -102,28 +102,23 @@ FAILED=1
# Configure file checks #
############################################################
#
SUBF_CONFDIR="${H5FD_SUBFILING_CONFIG_FILE_PREFIX:-.}"
# cd to the subfile configuration location
if [ "$SUBF_CONFDIR" != "." ] || [ "$SUBF_CONFDIR" != "$PWD" ]; then
cd "$SUBF_CONFDIR" || exit
fi
SUBF_CONFDIR="${H5FD_SUBFILING_CONFIG_FILE_PREFIX:-$PWD}"
# Try to find the config file
if [ -z "$file_config" ]; then
nfiles=$(find "$SUBF_CONFDIR" -maxdepth 1 -type f -iname "*.config" -printf '.' | wc -m)
if [[ "$nfiles" != "1" ]]; then
if [[ "$nfiles" == "0" ]]; then
echo -e "$RED Failed to find .config file in current directory. $NC"
echo -e "$RED Failed to find .config file in ${SUBF_CONFDIR} $NC"
usage
exit $FAILED
else
echo -e "$RED More than one .config file found in current directory. $NC"
echo -e "$RED More than one .config file found in ${SUBF_CONFDIR} $NC"
usage
exit $FAILED
fi
fi
file_config=$(find "$SUBF_CONFDIR" -maxdepth 1 -type f -iname '*.config')
file_config=$(find "${SUBF_CONFDIR}" -maxdepth 1 -type f -iname '*.config')
fi
if [ ! -f "$file_config" ]; then
@ -150,7 +145,8 @@ if test -z "$subfile_dir"; then
fi
# For bash 4.4+
mapfile -t subfiles < <( sed -e '1,/subfile_dir=/d' "$file_config" )
subfs=$(sed -e '1,/subfile_dir=/d' "$file_config")
mapfile -t subfiles <<< "$subfs"
if [ ${#subfiles[@]} -eq 0 ]; then
echo -e "$RED failed to find subfiles list in $file_config $NC"
exit $FAILED