From bacb4700310e5ff398df456f8351d216778f92ef Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Fri, 8 Apr 2016 16:56:20 +0300 Subject: [PATCH] Fix copy-paste mistakes and spelling --- boards.sh | 10 +++++----- build-all.sh | 2 +- common.sh | 2 +- general.sh | 3 +-- main.sh | 10 +++++----- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/boards.sh b/boards.sh index 5caefe234a..47ae03c561 100644 --- a/boards.sh +++ b/boards.sh @@ -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 diff --git a/build-all.sh b/build-all.sh index 2a8b3242f1..ed55a6927e 100644 --- a/build-all.sh +++ b/build-all.sh @@ -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//,/ }) diff --git a/common.sh b/common.sh index d568974083..a1b1eb9deb 100644 --- a/common.sh +++ b/common.sh @@ -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 diff --git a/general.sh b/general.sh index d6a111a149..83b5ebed60 100644 --- a/general.sh +++ b/general.sh @@ -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 diff --git a/main.sh b/main.sh index 34bb78391b..ca294eebc6 100644 --- a/main.sh +++ b/main.sh @@ -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