mirror of
https://github.com/krglaws/MyLFS.git
synced 2025-08-03 16:44:38 +00:00
fix man page deletion in main
This commit is contained in:
18
mylfs.sh
18
mylfs.sh
@ -586,7 +586,11 @@ function build_extension {
|
|||||||
source "$EXTENSION/packages.sh"
|
source "$EXTENSION/packages.sh"
|
||||||
|
|
||||||
# download extension packages
|
# download extension packages
|
||||||
|
# when download_packages fails, it calls 'exit'.
|
||||||
|
# need to make sure image is unmounted if that happens.
|
||||||
|
trap 'unmount_image; exit' EXIT
|
||||||
download_packages $EXTENSION
|
download_packages $EXTENSION
|
||||||
|
trap - EXIT
|
||||||
|
|
||||||
$VERBOSE && set -x
|
$VERBOSE && set -x
|
||||||
|
|
||||||
@ -732,9 +736,9 @@ function clean_image {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# delete logs
|
# delete logs
|
||||||
if [ -n "$(ls ./logs)" ]
|
if [ -d $LOG_DIR ] && [ -n "$(ls $LOG_DIR)" ]
|
||||||
then
|
then
|
||||||
rm -rf ./logs/*
|
rm $LOG_DIR/*
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -781,9 +785,12 @@ function main {
|
|||||||
build_phase 3 || { unmount_image && exit; }
|
build_phase 3 || { unmount_image && exit; }
|
||||||
|
|
||||||
# phase 3 cleanup
|
# phase 3 cleanup
|
||||||
rm -rf $LFS/usr/share/{info,man,doc}/*
|
if $BUILDALL || [ "$STARTPHASE" -le "3" ]
|
||||||
find $LFS/usr/{lib,libexec} -name \*.la -delete
|
then
|
||||||
rm -rf $LFS/tools
|
rm -rf $LFS/usr/share/{info,man,doc}/*
|
||||||
|
find $LFS/usr/{lib,libexec} -name \*.la -delete
|
||||||
|
rm -rf $LFS/tools
|
||||||
|
fi
|
||||||
|
|
||||||
$ONEOFF && $FOUNDSTARTPHASE && unmount_image && exit
|
$ONEOFF && $FOUNDSTARTPHASE && unmount_image && exit
|
||||||
|
|
||||||
@ -814,7 +821,6 @@ cd $(dirname $0)
|
|||||||
|
|
||||||
# import config vars
|
# import config vars
|
||||||
source ./config.sh
|
source ./config.sh
|
||||||
echo "LFS=$LFS"
|
|
||||||
|
|
||||||
# import package list
|
# import package list
|
||||||
source ./packages.sh
|
source ./packages.sh
|
||||||
|
Reference in New Issue
Block a user