From 12b3a44a1c2578005349a14bd9fdc49563d9838c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 14 Jul 2007 13:09:17 +0000 Subject: Upgrade populate.in: - systematically make paths absolute, - somewhat beautify the help ;essage, - explain why ../ is to be seatrched for. diff --git a/tools/populate.in b/tools/populate.in index eb527db..5180f26 100644 --- a/tools/populate.in +++ b/tools/populate.in @@ -11,7 +11,7 @@ myname=$(basename "$0") doHelp() { cat <<_EOF_ -$myname [ -f ] < -s source_root > < -d destination_root > +$myname [-f] [-v] -s source_root -d destination_root -f force execution: if destination directory already exists, it will be removed first. @@ -78,14 +78,8 @@ fi mkdir -p "${CT_ROOT_DST_DIR}" # Make all path absolute -case "${CT_ROOT_SRC_DIR}" in - /*) ;; - *) CT_ROOT_SRC_DIR=$(cd "${CT_ROOT_SRC_DIR}"; pwd) -esac -case "${CT_ROOT_DST_DIR}" in - /*) ;; - *) CT_ROOT_DST_DIR=$(cd "${CT_ROOT_DST_DIR}"; pwd) -esac +CT_ROOT_SRC_DIR=$(cd "${CT_ROOT_SRC_DIR}"; pwd) +CT_ROOT_DST_DIR=$(cd "${CT_ROOT_DST_DIR}"; pwd) cd "${CT_ROOT_SRC_DIR}" tar cf - . |(cd "${CT_ROOT_DST_DIR}"; tar xf -) @@ -105,6 +99,7 @@ while [ ${still_needed} -eq 1 ]; do ${CT_ECHO} " already present" continue fi + # Need to scan .. for libgcc_s et al. for dir in . usr ..; do ${CT_ECHO} -n " trying in \"${dir}\"" tgt_dir="${dir}" -- cgit v0.10.2-6-g49f6