diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-08-18 16:59:41 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-18 16:59:41 -0700 |
| commit | 9ed46667dbeee834f03c5f40d5231c0695bc4e7a (patch) | |
| tree | 53a64cdac0fd5a6938a3d0da7047e6417612e096 /bin/emerge-webrsync | |
| parent | emerge-*webrsync: use ${PORTAGE_BIN_PATH}/emerge (diff) | |
| download | portage-9ed46667dbeee834f03c5f40d5231c0695bc4e7a.tar.gz portage-9ed46667dbeee834f03c5f40d5231c0695bc4e7a.tar.bz2 portage-9ed46667dbeee834f03c5f40d5231c0695bc4e7a.zip | |
emerge-webrsync: use ${PORTAGE_TMPDIR}/portage
For consistency with commit 83e677766650e73071813c0d46547647e5f66029.
Diffstat (limited to 'bin/emerge-webrsync')
| -rwxr-xr-x | bin/emerge-webrsync | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 11d608ff6..5cba6b045 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -464,23 +464,23 @@ main() { exit 1 fi - TMPDIR=${PORTAGE_TMPDIR}/emerge-webrsync - ${keep} || DISTDIR=${TMPDIR} + [[ -d ${PORTAGE_TMPDIR}/portage ]] || mkdir -p "${PORTAGE_TMPDIR}/portage" + TMPDIR=$(mktemp -d "${PORTAGE_TMPDIR}/portage/webrsync-XXXXXX") + if [[ ! -w ${TMPDIR} ]] ; then + eecho "TMPDIR is not writable: ${TMPDIR}" + exit 1 + fi + trap 'cd / ; rm -rf "${TMPDIR}"' EXIT + cd "${TMPDIR}" || exit 1 - [ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" + ${keep} || DISTDIR=${TMPDIR} [ ! -d "${DISTDIR}" ] && mkdir -p "${DISTDIR}" - cd "${TMPDIR}" || exit 1 if ${keep} && [[ ! -w ${DISTDIR} ]] ; then eecho "DISTDIR is not writable: ${DISTDIR}" exit 1 fi - if [[ ! -w ${TMPDIR} ]] ; then - eecho "TMPDIR is not writable: ${TMPDIR}" - exit 1 - fi - # This is a sanity check to help prevent people like funtoo users # from accidentally wiping out their git tree. if [[ -n $SYNC && ${SYNC#rsync:} = $SYNC ]] ; then |