Skip to content

Commit 0df26f7

Browse files
committed
prevent newline from being added by using printf, remove debugging statements
1 parent 231db5b commit 0df26f7

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

eessi_container.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -761,20 +761,16 @@ do
761761
unset cfg_repo_id
762762
[[ ${VERBOSE} -eq 1 ]] && echo "add fusemount options for CVMFS repo '${cvmfs_repo}'"
763763
# split into name, access mode, and mount mode
764-
readarray -td, cvmfs_repo_args <<<"$cvmfs_repo"
765-
cvmfs_repo_name=${cvmfs_repo_args[0]%$'\n'} # remove possible trailing newline
764+
readarray -td, cvmfs_repo_args < <(printf '%s' "$cvmfs_repo")
765+
cvmfs_repo_name=${cvmfs_repo_args[0]}
766766
cvmfs_repo_access="${ACCESS}" # initialize to the default access mode
767767
cvmfs_repo_mount="fuse" # use fuse mounts by default
768768
for arg in ${cvmfs_repo_args[@]:1}; do
769769
if [[ $arg == "access="* ]]; then
770770
cvmfs_repo_access=${arg/access=}
771-
# remove possible trailing newline
772-
cvmfs_repo_access=${cvmfs_repo_access%$'\n'}
773771
fi
774772
if [[ $arg == "mount="* ]]; then
775773
cvmfs_repo_mount=${arg/mount=}
776-
# remove possible trailing newline
777-
cvmfs_repo_mount=${cvmfs_repo_mount%$'\n'}
778774
fi
779775
done
780776

@@ -791,9 +787,7 @@ do
791787
# cvmfs_repo_name is actually a repository ID, use that to obtain
792788
# the actual name from the EESSI_REPOS_CFG_FILE
793789
cfg_repo_id=${cvmfs_repo_name}
794-
echo "bob $cfg_repo_id"
795790
cvmfs_repo_name=$(cfg_get_value ${cfg_repo_id} "repo_name")
796-
echo $cvmfs_repo_name
797791
fi
798792
# remove project subdir in container
799793
cvmfs_repo_name=${cvmfs_repo_name%"/${EESSI_DEV_PROJECT}"}

0 commit comments

Comments
 (0)