oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make easypack remove tar after it's finished; and check for root, in

Browse Source 
which case don't check for writability of source dir
This commit is contained in:
Ben Gras 2005-12-12 14:07:03 +00:00
parent 0a4047a8fe
commit f18384d54c
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
commands/scripts/easypack.sh
View File

@ -24,13 +24,16 @@ esac
# Change to source directory # Change to source directory
ORIG_DIR=`pwd` ORIG_DIR=`pwd`
rm -rf Log # remove old debugging log rm -f Log # remove old debugging log
cd $SOURCE_DIR cd $SOURCE_DIR || exit
# Check for write permission here if [ "`id -u`" -ne 0 ]
if test ! -w . then
then echo You do not have write permission for $SOURCE_DIR # Check for write permission here
exit 1 if test ! -w .
then echo You do not have write permission for $SOURCE_DIR
exit 1
fi
fi fi
# Check for -o flag; if found, set OVERWRITE # Check for -o flag; if found, set OVERWRITE
@ -57,31 +60,32 @@ do # Check to see if it exists. Don't overwrite unless -o given
fi fi
# Remove any junk from previous attempts # Remove any junk from previous attempts
rm -rf $i.tar.bz2 $i.tar rm -f $i.tar.bz2 $i.tar
# Get the package # Get the package
URL=$SOFTWARE_DIR/$i.tar.bz2 URL=$SOFTWARE_DIR/$i.tar.bz2
URL1=$URL URL1=$URL
urlget $URL >$i.tar.bz2 TARBZ=$i.tar.bz2
urlget $URL >$TARBZ
# See if we got the file or an error # See if we got the file or an error
if grep "<html>" $i.tar.bz2 >/dev/null if grep "<html>" $TARBZ >/dev/null
then # It is not in the directory of tested software. Try beta dir. then # It is not in the directory of tested software. Try beta dir.
URL=$BETA_DIR/$i.tar.bz2 URL=$BETA_DIR/$TARBZ
urlget $URL >$i.tar.bz2 urlget $URL >$TARBZ
if grep "<HTML>" $i.tar.bz2 >/dev/null || grep "<html>" $i.tar.bz2 >/dev/null if grep "<HTML>" $TARBZ >/dev/null || grep "<html>" $TARBZ >/dev/null
then echo Cannot get $i. then echo Cannot get $i.
echo " " Tried $URL1 echo " " Tried $URL1
echo " " Tried $URL echo " " Tried $URL
echo " " Skipping this package echo " " Skipping this package
rm -rf $i.tar.bz2 rm -f $TARBZ
continue continue
fi fi
fi fi
# We got it. Unpack it. # We got it. Unpack it.
echo Package $i fetched echo Package $i fetched
bunzip2 $i.tar.bz2 || smallbunzip2 $i.tar.bz2 bunzip2 $TARBZ || smallbunzip2 $TARBZ
tar xf $i.tar tar xf $i.tar
if test ! -d $i if test ! -d $i
then echo Unable to unpack $i then echo Unable to unpack $i
@ -98,6 +102,6 @@ do # Check to see if it exists. Don't overwrite unless -o given
# Clean up # Clean up
cd .. cd ..
# rm -rf $i.tar* rm -f $i.tar $TARBZ # Remove whatever is still lying around
done done