From c37a06fe1d1fbd2be73adc725323e8a4665eeb09 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 30 May 2018 22:50:23 -0400 Subject: libmakepkg: when checking for write permissions, handle pre-existing dirs Simplifies the function a bit, but mostly, mkdir -p will never fail if the directory exists, and therefore makepkg never checks to see if it is actually writable. On the other hand, it's unnecessary to check if the directory exists once we know mkdir -p succeeded... Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/libmakepkg/util/util.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/libmakepkg') diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index c2f9c624..e1ca5cb7 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -86,12 +86,12 @@ ensure_writable_dir() { local dirtype="$1" dirpath="$2" if ! mkdir -p "$dirpath" 2>/dev/null; then - if [[ -d $dirpath && ! -w $dirpath ]]; then - error "$(gettext "You do not have write permission for the directory \$%s (%s).")" "$dirtype" "$dirpath" - else - error "$(gettext "Failed to create the directory \$%s (%s).")" "$dirtype" "$dirpath" - fi + error "$(gettext "Failed to create the directory \$%s (%s).")" "$dirtype" "$dirpath" + return 1 + elif [[ ! -w $dirpath ]]; then + error "$(gettext "You do not have write permission for the directory \$%s (%s).")" "$dirtype" "$dirpath" return 1 fi + return 0 } -- cgit v1.2.3-70-g09d2