Merge pull request #4 from dave-kennedy/master

Bug fixes and minor formatting changes
This commit is contained in:
Horea Christian 2016-01-27 09:55:20 +01:00
commit 1d6feff327

View file

@ -66,8 +66,7 @@ then
fi
# determines if filename was given with relative or absolute path
if [ "`echo $ARCHIVE | grep -c '\/'`" -gt "0" ] && \
[ "`echo $ARCHIVE | grep -c '^\/'`" -gt "0" ]
if [ "`echo $ARCHIVE | grep -c '^\/'`" -gt "0" ]
then
STAGE4_FILENAME="${ARCHIVE}.tar.bz2"
else
@ -79,20 +78,23 @@ shift;OPTIONS="$@"
# Excludes:
EXCLUDES="\
--exclude=.bash_history \
--exclude=dev/* \
--exclude=lost+found \
--exclude=media/* \
--exclude=mnt/*/* \
--exclude=proc/* \
--exclude=run/* \
--exclude=sys/* \
--exclude=tmp/* \
--exclude=mnt/*/* \
--exclude=usr/portage/* \
--exclude=var/lock/* \
--exclude=var/log/* \
--exclude=var/run/* \
--exclude=.bash_history \
--exclude=lost+found \
--exclude=usr/portage/*"
--exclude=var/run/*"
if [ "$TARGET" == "/" ]
then
EXCLUDES+=" --exclude=$STAGE4_FILENAME"
EXCLUDES+=" --exclude=${STAGE4_FILENAME#/}"
fi
if [ ${EXCLUDE_CONNMAN} -eq 1 ]