Fix copy-paste mistakes and spelling

This commit is contained in:
zador-blood-stained 2016-04-08 16:56:20 +03:00
parent fcacbaf974
commit bacb470031
5 changed files with 13 additions and 14 deletions

View File

@ -173,7 +173,7 @@ install_kernel (){
# Install kernel to prepared root file-system
#--------------------------------------------------------------------------------------------------------------------------------
display_alert "Install kernel" "$CHOSEN_KERNEL" "info"
display_alert "Installing packages" "$CHOSEN_KERNEL" "info"
# configure MIN / MAX speed for cpufrequtils
echo "ENABLE=true" > $CACHEDIR/sdcard/etc/default/cpufrequtils
@ -228,22 +228,22 @@ install_kernel (){
chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb >/dev/null 2>&1"
# install uboot
display_alert "Install u-boot" "$CHOSEN_UBOOT" "info"
display_alert "Installing u-boot" "$CHOSEN_UBOOT" "info"
chroot $CACHEDIR/sdcard /bin/bash -c "DEVICE=/dev/null dpkg -i /tmp/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb > /dev/null"
# install headers
display_alert "Install headers" "$HEADERS_TMP" "info"
display_alert "Installing headers" "$HEADERS_TMP" "info"
chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/${HEADERS_TMP}_${REVISION}_${ARCH}.deb > /dev/null"
# install firmware
if [[ -f $CACHEDIR/sdcard/tmp/${FW_TMP}_${REVISION}_${ARCH}.deb ]]; then
display_alert "Install firmware" "$FW_TMP" "info"
display_alert "Installing firmware" "$FW_TMP" "info"
chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/${FW_TMP}_${REVISION}_${ARCH}.deb > /dev/null"
fi
# install DTB
if [[ -f $CACHEDIR/sdcard/tmp/${DTB_TMP}_${REVISION}_${ARCH}.deb ]]; then
display_alert "Install DTB" "$DTB_TMP" "info"
display_alert "Installing DTB" "$DTB_TMP" "info"
chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/${DTB_TMP}_${REVISION}_${ARCH}.deb > /dev/null"
fi

View File

@ -39,7 +39,7 @@ while [[ $k1 -lt ${#MYARRAY1[@]} ]]
RELEASE=${MYARRAY1[$k1]}
BRANCH=$2
unset IFS array DESKTOP_TARGET LINUXFAMILY LINUXCONFIG LINUXKERNEL LINUXSOURCE KERNELBRANCH \
BOOTLOADER BOOTSOURCE BOOTBRANCH CPUMIN GOVERNOR needs_uboot needs_kernel BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN
BOOTLOADER BOOTSOURCE BOOTBRANCH CPUMIN GOVERNOR NEEDS_UBOOT NEEDS_KERNEL BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN
source $SRC/lib/configuration.sh
array=(${DESKTOP_TARGET//,/ })

View File

@ -265,7 +265,7 @@ install_external_applications ()
#--------------------------------------------------------------------------------------------------------------------------------
# Install external applications example
#--------------------------------------------------------------------------------------------------------------------------------
display_alert "Installing extra applications and drivers" "customize-image.sh" "info"
display_alert "Installing extra applications and drivers" "" "info"
for plugin in $SRC/lib/extras/*.sh; do
source $plugin

View File

@ -179,8 +179,7 @@ fingerprint_image (){
#--------------------------------------------------------------------------------------------------------------------------------
# Saving build summary to the image
#--------------------------------------------------------------------------------------------------------------------------------
display_alert "Fingerprinting." "$VERSION Linux $VER" "info"
#echo -e "[\e[0;32m ok \x1B[0m] Fingerprinting"
display_alert "Fingerprinting" "$VERSION Linux" "info"
echo "--------------------------------------------------------------------------------" > $1
echo "" >> $1

10
main.sh
View File

@ -270,15 +270,15 @@ for option in $(tr ',' ' ' <<< "$CLEAN_LEVEL"); do
[[ $option != sources ]] && cleaning "$option"
done
[[ ! -f $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb ]] && needs_uboot=yes
[[ ! -f $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb ]] && needs_kernel=yes
[[ ! -f $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb ]] && NEEDS_UBOOT=yes
[[ ! -f $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb ]] && NEEDS_KERNEL=yes
# patching sources if we need to compile u-boot or kernel
[[ $needs_uboot == yes || $needs_kernel == yes ]] && patching_sources
[[ $NEEDS_UBOOT == yes || $NEEDS_KERNEL == yes ]] && patching_sources
# Compile source if packed not exists
[[ $needs_uboot = yes ]] && compile_uboot
[[ $needs_kernel = yes ]] && compile_kernel
[[ $NEEDS_UBOOT = yes ]] && compile_uboot
[[ $NEEDS_KERNEL = yes ]] && compile_kernel
[[ -n $RELEASE ]] && create_board_package