[Radmind-commit] radmind ra.sh,1.33,1.34

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12106

Modified Files:
	ra.sh 
Log Message:
Respect TMPDIR environment variable if set. Thanks to Hauke Fath for drawing attention to it.


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ra.sh	7 Nov 2006 19:09:22 -0000	1.33
--- ra.sh	7 Nov 2006 19:35:19 -0000	1.34
***************
*** 26,29 ****
--- 26,30 ----
  EDITOR=${EDITOR:-vi}
  USER=${SUDO_USER:-$USER}
+ TMPDIR="${TMPDIR:=/tmp}"
  DEFAULTS="/etc/defaults/radmind"
  FSDIFFROOT="."
***************
*** 41,47 ****
  MKTEMP="_RADMIND_MKTEMP"
  TEMPFILES=FALSE
! TMPDIR="/tmp/.ra.$$"
! if [ -f "${MKTEMP}" ]; then
!     TMPDIR=`${MKTEMP} -qd /tmp/.ra.$$.XXXXXX`
      if [ $? -ne 0 ]; then
  	echo "mktemp failed"
--- 42,48 ----
  MKTEMP="_RADMIND_MKTEMP"
  TEMPFILES=FALSE
! RASHTMP="${TMPDIR}/.ra.$$"
! if [ -f "${MKTEMP}"  ]; then
!     RASHTMP=`${MKTEMP} -qd "${TMPDIR}/.ra.$$.XXXXXX"`
      if [ $? -ne 0 ]; then
  	echo "mktemp failed"
***************
*** 49,54 ****
      fi
  fi
! LTMP="${TMPDIR}/lapply.out"
! FTMP="${TMPDIR}/fsdiff.out"
  
  # different systems use different default dirs
--- 50,55 ----
      fi
  fi
! LTMP="${RASHTMP}/lapply.out"
! FTMP="${RASHTMP}/fsdiff.out"
  
  # different systems use different default dirs
***************
*** 87,91 ****
  cleanup() {
      if [ "$TEMPFILES" = FALSE ]; then
! 	rm -fr "${TMPDIR}"
      fi
  }
--- 88,92 ----
  cleanup() {
      if [ "$TEMPFILES" = FALSE ]; then
! 	rm -fr "${RASHTMP}"
      fi
  }
***************
*** 324,331 ****
  cd /
  
! if [ ! -d ${TMPDIR} ]; then
!     mkdir -m 700 ${TMPDIR} 
      if [ $? -ne 0 ]; then
!         echo "Cannot create temporary directory $TMPDIR" 
  	exit 1
      fi
--- 325,332 ----
  cd /
  
! if [ ! -d "${RASHTMP}" ]; then
!     mkdir -m 700 "${RASHTMP}"
      if [ $? -ne 0 ]; then
!         echo "Cannot create temporary directory $RASHTMP" 
  	exit 1
      fi
***************
*** 407,411 ****
  	TNAME=`hostname | cut -d. -f1`-`date +%Y%m%d`-${USER}.T
      fi
!     FTMP="${TMPDIR}/${TNAME}"
      fsdiff -C ${CASE} ${FPROGRESS} ${CHECKSUM} -o ${FTMP} ${FSDIFFROOT}
      if [ $? -ne 0 ]; then
--- 408,412 ----
  	TNAME=`hostname | cut -d. -f1`-`date +%Y%m%d`-${USER}.T
      fi
!     FTMP="${RASHTMP}/${TNAME}"
      fsdiff -C ${CASE} ${FPROGRESS} ${CHECKSUM} -o ${FTMP} ${FSDIFFROOT}
      if [ $? -ne 0 ]; then