From 7896c2ce601dc778a7fc466d691906b7572fda00 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Mon, 1 Oct 2012 15:31:56 +0200 Subject: [PATCH] [mvparent] Get rid of useless error messages Test the presence of files in the directory before to call mv, in order to avoid useless mv error message. --- mvparent/mvparent.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mvparent/mvparent.sh b/mvparent/mvparent.sh index 02d63ab..b3cda7b 100755 --- a/mvparent/mvparent.sh +++ b/mvparent/mvparent.sh @@ -26,5 +26,13 @@ fi echo "Move the contents of « $rep/$cible » into « $rep »…" >&2 cd "$rep" -mv "$cible"/* "$cible"/.[!.]* . + +if [ "$(echo "$cible"/*)" != "$cible/*" ] ; then + mv "$cible"/* . +fi + +if [ "$(echo "$cible"/.[!.]*)" != "$cible/.[!.]*" ] ; then + mv "$cible"/.[!.]* . +fi + rmdir "$cible"