removed hardcoded username

git-svn-id: trunk@9088 -
This commit is contained in:
vincents 2006-04-06 13:45:29 +00:00
parent cbf8e47ffc
commit b062947c8e
2 changed files with 8 additions and 6 deletions

View File

@ -46,12 +46,12 @@ FPCARCH=`$COMPILER -iSP`
# clean installdir: since I am not root and the install dir can contain files owned by root # clean installdir: since I am not root and the install dir can contain files owned by root
# created by a previous freeze, I just move it out of the way # created by a previous freeze, I just move it out of the way
if [ ! -d /tmp/vsnijders/trash ] ; then if [ ! -d /tmp/`whoami`/trash ] ; then
mkdir -p /tmp/vsnijders/trash mkdir -p /tmp/`whoami`/trash
fi fi
rm -rf $INSTALLDIR rm -rf $INSTALLDIR
if [ -d $INSTALLDIR ]; then if [ -d $INSTALLDIR ]; then
mv $INSTALLDIR /tmp/vsnijders/trash/ mv $INSTALLDIR /tmp/`whoami`/trash/
fi fi
mkdir -p $INSTALLDIR mkdir -p $INSTALLDIR
make install PP=$COMPILER INSTALL_PREFIX=$INSTALLDIR make install PP=$COMPILER INSTALL_PREFIX=$INSTALLDIR

View File

@ -18,13 +18,15 @@ INSTALLDIR=~/tmp/fpcsrc
DATESTAMP=`date +%Y%m%d` DATESTAMP=`date +%Y%m%d`
PACKPROJ=fpcsrc.packproj PACKPROJ=fpcsrc.packproj
# clean installdir: since I am not root and the install dir can contain files owned by root # clean installdir: since I am not root and the install dir can contain files owned by root
# created by a previous freeze, I just move it out of the way # created by a previous freeze, I just move it out of the way
if [ ! -d /tmp/fpcfan/trash ] ; then TRASHDIR=/tmp/`whoami`/trash
mkdir -p /tmp/fpcfan/trash if [ ! -d $TRASHDIR ] ; then
mkdir -p $TRASHDIR
fi fi
if [ -d $INSTALLDIR ] ; then if [ -d $INSTALLDIR ] ; then
mv $INSTALLDIR /tmp/fpcfan/trash/fpcsrc-`date +%Y%m%d%H%M%S` mv $INSTALLDIR $TRASHDIR/fpcsrc-`date +%Y%m%d%H%M%S`
fi fi
# copy sources # copy sources