diff --git a/gitlab/functions.sh b/gitlab/functions.sh index 9ccd6f1f2824b71cac360a960e9de3c279e92f36..fa1df62aed6a601dbe62031994f95c60cbdb738a 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -300,19 +300,19 @@ install_miniconda() { bash miniconda.sh -b -p ${1} # Put back cache and merge urls.txt - if [ -e ${1}.cached ]; then - run_cmd mv -n ${1}.cached/pkgs/*.tar.bz2 ${1}/pkgs/ - fi _cached_urls="${1}.cached/pkgs/urls.txt" _urls="${1}/pkgs/urls.txt" - if [ -e ${_cached_urls} ]; then + if [ -e ${1}.cached ]; then log_info "Merging urls.txt files with cached values..." + mv -n ${1}.cached/pkgs/*.tar.bz2 ${1}/pkgs/ cat ${_urls} ${_cached_urls} | sort | uniq > ${_urls} + # remove the backup cache folder + rm -rf ${1}.cached fi # List currently available packages on cache - run_cmd ls -l ${1}/pkgs/ - run_cmd cat ${1}/pkgs/urls.txt + # run_cmd ls -l ${1}/pkgs/ + # run_cmd cat ${1}/pkgs/urls.txt hash -r }