Cleanup

Author: Neves-P

EESSI-install-software.sh

@@ -207,7 +207,6 @@ export PYTHONPYCACHEPREFIX=$TMPDIR/pycache
 # - .lmod/lmodrc.lua
 # - .lmod/SitePackage.lua
 _eessi_software_path=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
-echo "_eessi_software_path: ${_eessi_software_path}"  
 _lmod_cfg_dir=${_eessi_software_path}/.lmod
 _lmod_rc_file=${_lmod_cfg_dir}/lmodrc.lua
 if [ ! -f ${_lmod_rc_file} ]; then

bot/check-build.sh

@@ -480,12 +480,6 @@ if [[ ! -z ${TARBALL} ]]; then
     accelerator=$(cfg_get_value "architecture" "accelerator")
     prefix="${repo_version}/software/${os_type}/${software_subdir}"
 
-    # if building for dev.eessi.io is set, the prefix is different
-    # it needs the project name in the path
-    # if [ ! -z ${EESSI_DEV_PROJECT} ]; then
-    #     prefix="${repo_version}/${EESSI_DEV_PROJECT}/software/${os_type}/${software_subdir}"
-    # fi
-
     # if we build for an accelerator, the prefix is different
     if [[ ! -z ${accelerator} ]]; then
       prefix="${prefix}/accel/${accelerator}"

create_tarball.sh

@@ -20,10 +20,7 @@ echo ">> tmpdir: $tmpdir"
 os="linux"
 source ${base_dir}/init/eessi_defaults
 cvmfs_repo=${EESSI_CVMFS_REPO}
-echo "create_tarball.sh: cvmfs_repo=${cvmfs_repo}"
 software_dir="${cvmfs_repo}/versions/${eessi_version}/software/${os}/${cpu_arch_subdir}"
-echo "create_tarball.sh: software_dir=${software_dir}"
-
 if [ ! -d ${software_dir} ]; then
     echo "Software directory ${software_dir} does not exist?!" >&2
     exit 2
@@ -32,7 +29,6 @@ fi
 cvmfs_repo_name=${cvmfs_repo%"/${EESSI_DEV_PROJECT}"}
 cvmfs_repo_name=${cvmfs_repo_name#/cvmfs/}
 overlay_upper_dir="${eessi_tmpdir}/${cvmfs_repo_name}/overlay-upper${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}"
-echo "create_tarball.sh: overlay_upper_dir=${overlay_upper_dir}"
 
 software_dir_overlay="${overlay_upper_dir}/versions/${eessi_version}"
 if [ ! -d ${software_dir_overlay} ]; then

eessi_container.sh

@@ -732,11 +732,9 @@ do
     fi
     # remove project subdir in container
     cvmfs_repo_name=${cvmfs_repo_name%"/${EESSI_DEV_PROJECT}"}
-    echo "Adjusted cvmfs_repo_name: ${cvmfs_repo_name}"
 
     # always create a directory for the repository (e.g., to store settings, ...)
     mkdir -p ${EESSI_TMPDIR}/${cvmfs_repo_name}
-    echo "Created directory for repository: ${EESSI_TMPDIR}/${cvmfs_repo_name}"
 
 
     # add fusemount options depending on requested access mode ('ro' - read-only; 'rw' - read & write)
@@ -786,7 +784,6 @@ do
         # use repo-specific overlay directories
         mkdir -p ${EESSI_TMPDIR}/${cvmfs_repo_name}/overlay-upper${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}
         mkdir -p ${EESSI_TMPDIR}/${cvmfs_repo_name}/overlay-work${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}
-        echo "Created overlay directories ${EESSI_TMPDIR}/${cvmfs_repo_name}/overlay-upper${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}"
 
         [[ ${VERBOSE} -eq 1 ]] && echo -e "TMP directory contents:\n$(ls -l ${EESSI_TMPDIR})"
 

init/minimal_eessi_env

@@ -8,10 +8,8 @@ EESSI_INIT_DIR_PATH=$(dirname $(readlink -f $BASH_SOURCE))
 #   script takes *_OVERRIDEs into account
 source ${EESSI_INIT_DIR_PATH}/eessi_defaults
 
-
 export EESSI_PREFIX=$EESSI_CVMFS_REPO/versions/$EESSI_VERSION
 
-
 if [[ $(uname -s) == 'Linux' ]]; then
     export EESSI_OS_TYPE='linux'
 else