| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | scripts/libmakepkg/util/util.sh.in | 17 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 25 |
diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index 7ccd2f8c..f9af5f32 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -83,3 +83,20 @@ cd_safe() { exit 1 fi } + +# Try to create directory if one does not yet exist. Fails if the directory +# exists but has no write permissions, or if there is an existing file with +# the same name. +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 + return 1 + fi + return 0 +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index adfb3604..4f803bc2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1365,35 +1365,25 @@ else fi -if [[ ! -d $BUILDDIR ]]; then - if ! mkdir -p "$BUILDDIR"; then - error "$(gettext "You do not have write permission to create packages in %s.")" "$BUILDDIR" - plain "$(gettext "Aborting...")" - exit $E_FS_PERMISSIONS - fi - chmod a-s "$BUILDDIR" -fi -if [[ ! -w $BUILDDIR ]]; then - error "$(gettext "You do not have write permission to create packages in %s.")" "$BUILDDIR" +# check that all settings directories are user-writable +if ! ensure_writable_dir "BUILDDIR" "$BUILDDIR"; then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi +chmod a-s "$BUILDDIR" -if (( ! (NOBUILD || GENINTEG) )) && [[ ! -w $PKGDEST ]]; then - error "$(gettext "You do not have write permission to store packages in %s.")" "$PKGDEST" +if (( ! (NOBUILD || GENINTEG) )) && ! ensure_writable_dir "PKGDEST" "$PKGDEST"; then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi -if [[ ! -w $SRCDEST ]] ; then - error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" +if ! ensure_writable_dir "SRCDEST" "$SRCDEST" ; then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi if (( SOURCEONLY )); then - if [[ ! -w $SRCPKGDEST ]]; then - error "$(gettext "You do not have write permission to store source tarballs in %s.")" "$SRCPKGDEST" + if ! ensure_writable_dir "SRCPKGDEST" "$SRCPKGDEST"; then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi @@ -1403,8 +1393,7 @@ if (( SOURCEONLY )); then IGNOREARCH=1 fi -if (( LOGGING )) && [[ ! -w $LOGDEST ]]; then - error "$(gettext "You do not have write permission to store logs in %s.")" "$LOGDEST" +if (( LOGGING )) && ! ensure_writable_dir "LOGDEST" "$LOGDEST"; then plain "$(gettext "Aborting...")" exit $E_FS_PERMISSIONS fi |