From 7fca77ec9fa4a863380672df69110c9a03a687f1 Mon Sep 17 00:00:00 2001 From: bigeagle Date: Sun, 20 Nov 2016 16:49:13 +0800 Subject: [PATCH] dir-not-empty function --- helpers/apt-download | 6 +++--- helpers/helpers | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/helpers/apt-download b/helpers/apt-download index 5cd02f5..2476722 100644 --- a/helpers/apt-download +++ b/helpers/apt-download @@ -161,9 +161,9 @@ function apt-download-binary() { [[ $downloaded == false ]] && ERROR=1 done - mv ${pkgidx_tmp_dir}/* ${pkgidx_dir} - mv ${comp_tmp_dir}/* ${comp_dir} - mv ${dist_tmp_dir}/* ${dist_dir} + dir-not-empty ${pkgidx_tmp_dir} && mv ${pkgidx_tmp_dir}/* ${pkgidx_dir} + dir-not-empty ${dist_tmp_dir} && mv ${dist_tmp_dir}/* ${dist_dir} + dir-not-empty ${comp_tmp_dir} && mv ${comp_tmp_dir}/* ${comp_dir} rmdir ${pkgidx_tmp_dir} ${dist_tmp_dir} ${comp_tmp_dir} diff --git a/helpers/helpers b/helpers/helpers index b55d341..091aac9 100644 --- a/helpers/helpers +++ b/helpers/helpers @@ -13,5 +13,15 @@ function check-and-download() { return } +function dir-not-empty() { + local dir=$1 + [[ ! -d "$dir" ]] && return 1 + nfiles=$(ls -a "$dir" | wc -l) + if (( ${nfiles} > 2 )); then + return 0 + fi + return 1 +} + LOADED_HELPERS="yes"