dir_is_empty(): Move shift and remove duplicate pattern

Also update copyright notice.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/dir.sh b/src/dir.sh
index ac7fef0..c04aa55 100644
--- a/src/dir.sh
+++ b/src/dir.sh
@@ -1,6 +1,6 @@
 # Miscellaneous directory-related functions
 #
-# Copyright (C) 2013, 2014  Patrick "P. J." McDermott
+# Copyright (C) 2013, 2014  Patrick McDermott
 #
 # This file is part of the ProteanOS Development Kit.
 #
@@ -21,11 +21,11 @@
 dir_is_empty()
 {
 	local dir="${1}"
+	shift 1
 	local ret=
 	local dirent=
 	local exclude=
 	local exclusion=
-	shift 1
 
 	ret=0
 
@@ -35,7 +35,7 @@ dir_is_empty()
 	#          and aren't ".."
 	#   .??*   dirents whose names start with "." and are three or more
 	#          characters long
-	for dirent in "${dir}/"* "${dir}/".[!.] "${dir}/".[!.] "${dir}/".??*; do
+	for dirent in "${dir}/"* "${dir}/".[!.] "${dir}/".??*; do
 		if ! [ -e "${dirent}" ]; then
 			continue
 		fi