Add function "run_packages"
This commit is contained in:
parent
dc022f7507
commit
dea333c4de
1 changed files with 17 additions and 10 deletions
27
build.sh
27
build.sh
|
@ -38,23 +38,30 @@ EOF
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
run_packages() {
|
||||||
|
if [ -f "$1" ]; then
|
||||||
|
log_begin "$1"
|
||||||
|
|
||||||
|
PACKAGES="$(sed -f "$SCRIPT_DIR/remove-comments.sed" < "$1")"
|
||||||
|
|
||||||
|
if [ -n "$PACKAGES" ]; then
|
||||||
|
on_chroot <<EOF
|
||||||
|
apt-get install --n-install-recommends -y $PACKAGES
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
log_end "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
run_sub_stage() {
|
run_sub_stage() {
|
||||||
log "Begin ${SUB_STAGE_DIR}"
|
log "Begin ${SUB_STAGE_DIR}"
|
||||||
pushd ${SUB_STAGE_DIR} > /dev/null
|
pushd ${SUB_STAGE_DIR} > /dev/null
|
||||||
for i in {00..99}; do
|
for i in {00..99}; do
|
||||||
run_debconf "$SUB_STAGE_DIR/$i-debconf"
|
run_debconf "$SUB_STAGE_DIR/$i-debconf"
|
||||||
run_packages_nr "$SUB_STAGE_DIR/$i-packages-nr"
|
run_packages_nr "$SUB_STAGE_DIR/$i-packages-nr"
|
||||||
|
run_packages "$SUB_STAGE_DIR/$i-packages"
|
||||||
|
|
||||||
if [ -f ${i}-packages ]; then
|
|
||||||
log "Begin ${SUB_STAGE_DIR}/${i}-packages"
|
|
||||||
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages)"
|
|
||||||
if [ -n "$PACKAGES" ]; then
|
|
||||||
on_chroot << EOF
|
|
||||||
apt-get install -y $PACKAGES
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
log "End ${SUB_STAGE_DIR}/${i}-packages"
|
|
||||||
fi
|
|
||||||
if [ -d ${i}-patches ]; then
|
if [ -d ${i}-patches ]; then
|
||||||
log "Begin ${SUB_STAGE_DIR}/${i}-patches"
|
log "Begin ${SUB_STAGE_DIR}/${i}-patches"
|
||||||
pushd ${STAGE_WORK_DIR} > /dev/null
|
pushd ${STAGE_WORK_DIR} > /dev/null
|
||||||
|
|
Reference in a new issue