bash scripts: Make script output more user-friendly

5 files changed, 29 insertions, 24 deletions

diff --git a/resources/scripts/helpers/download/bucts b/resources/scripts/helpers/download/bucts
index 7e3f72d..ac12d1c 100755
--- a/resources/scripts/helpers/download/bucts
+++ b/resources/scripts/helpers/download/bucts
@@ -29,7 +29,7 @@ set -u -e
 # Remove the old version that may exist
 # -----------------------------------------------------------
 
-echo "DOWNLOADING BUCTS"
+printf "Downloading bucts\n"
 
 rm -rf bucts
 
@@ -45,12 +45,13 @@ cd bucts
 # Reset to the last commit that was tested
 # -----------------------------------------------------------
 
+printf "Patching bucts to not require git for building\n"
 git reset --hard dc27919d7a66a6e8685ce07c71aefa4f03ef7c07
 git am "../resources/bucts/patch/0001-Makefile-don-t-use-git.patch"
 
 # we're done
 cd ../
 
-echo "BUCTS DOWNLOAD COMPLETE"
+printf "\n\n"
 
 # ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index 281d72c..445c793 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -24,6 +24,8 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
+printf "Downloading coreboot, patching coreboot and deblobbing coreboot\n"
+
 # This grabs current base used, and applies patches
 # This is also used to run the deblob scripts.
 
@@ -47,39 +49,39 @@ git reset --hard 6532676f9328ca3bd197b714db4f1de23544cbde
 # Get patches from review.coreboot.org
 # ----------------------------------------------------------------------------------
 
-# Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)
+printf "Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cherry-pick FETCH_HEAD
 
-# lenovo/x60: Enable legacy brightness controls (native graphics)
+printf "lenovo/x60: Enable legacy brightness controls (native graphics)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/48/7048/4 && git cherry-pick FETCH_HEAD
 
-# Enable T60 native graphics
+printf "Enable T60 native graphics\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/45/5345/9 && git cherry-pick FETCH_HEAD
-# Enable text-mode graphics for T60
+printf "Enable text-mode graphics for T60\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/50/7050/2 && git cherry-pick FETCH_HEAD
-# lenovo/t60: Enable legacy brightness controls (native graphics)
+printf "lenovo/t60: Enable legacy brightness controls (native graphics)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/51/7051/1 && git cherry-pick FETCH_HEAD
 
-# Enable cstates 1 and 2 on macbook21. This reduces heat / power usage when the system is idle
+printf "Enable cstates 1 and 2 on macbook21. This reduces heat / power usage when the system is idle\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/23/7923/2 && git cherry-pick FETCH_HEAD
 
-# ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan
+printf "ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/58/7058/7 && git cherry-pick FETCH_HEAD
 
-# i945: permanently set tft_brightness to 0xff. this fixes the issue with X60 and "scrolling" backlight
+printf "i945: permanently set tft_brightness to 0xff. this fixes the issue with X60 and 'scrolling' backlight\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/61/7561/2 && git cherry-pick FETCH_HEAD
 
-# northbridge/gm45/raminit.c: enable GS45 high-perf (i.e. add X200S support to libreboot)
+printf "northbridge/gm45/raminit.c: enable GS45 high-perf (i.e. add X200S support to libreboot)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/86/7786/1 && git cherry-pick FETCH_HEAD
-# fix uneven backlight on X200 (when setting brightness low)
+printf "fix uneven backlight on X200 (when setting brightness low)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/79/7979/1 && git cherry-pick FETCH_HEAD
 
-# ThinkPad R400 support. Based on http://review.coreboot.org/#/c/8393/
+printf "ThinkPad R400 support. Based on http://review.coreboot.org/#/c/8393/\n"
 # This diff will be deleted later, and instead the patch will be fetched from coreboot gerrit
 # (and later, it won't even do that, once the R400 support is merged in coreboot)
 git am ../resources/libreboot/patch/r400.diff
 
-# Fix build issue when building coreboot without .git
+printf "Fix build issue when building coreboot without .git\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/23/8423/1 && git cherry-pick FETCH_HEAD
 # TODO: delete the above line, test these commits:
 # http://review.coreboot.org/#/c/8427/
@@ -88,9 +90,7 @@ git fetch http://review.coreboot.org/coreboot refs/changes/23/8423/1 && git cher
 # Run coreboot-libre deblob scripts
 # ---------------------------------------------------------------------------------
 
-# The git history (git diff command) shows what blobs were deleted 
-# along with the contents of those blobs. This needs to be deleted
-# for libreboot's purposes.
+printf "Deleting .git* in coreboot/ (history inside .git contains the blobs that were deleted)\n"
 rm -rf .git
 rm -f .gitreview
 rm -f .gitmodules
@@ -98,9 +98,11 @@ rm -f .gitignore
 
 cd ../
 
-# Deblob coreboot
+printf "Deblobbing coreboot\n"
 ./resources/utilities/coreboot-libre/deblob
 
+printf "\n\n"
+
 # ------------------- DONE ----------------------
 
 
diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom
index 81e8cae..80a1436 100755
--- a/resources/scripts/helpers/download/flashrom
+++ b/resources/scripts/helpers/download/flashrom
@@ -29,7 +29,7 @@ set -u -e
 # Remove the old version that may still exist:
 # ---------------------------------------------------------------------
 
-echo "DOWNLOADING FLASHROM"
+printf "Downloading flashrom\n"
 
 rm -rf flashrom
 
@@ -44,15 +44,17 @@ svn co -r 1858 svn://flashrom.org/flashrom/trunk flashrom
 cd flashrom/
 
 # Add whitelist for X200:
+printf "Patching board_enable.c for X200 whitelist\n"
 patch board_enable.c < ../resources/flashrom/patch/x200whitelist.diff
 
 # Remove redundant definitions for the flash chips that
 # supported libreboot machines use. This removes the need
 # for the user to run with the "-c" argument on these machines
+printf "Patching flashchips.c to remove the redundant entries\n"
 patch flashchips.c < ../resources/flashrom/patch/purged_chips.diff
 
 cd ../
 
-echo "FINISHED DOWNLOADING FLASHROM"
+printf "\n\n"
 
 # ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index 6145293..231dd32 100755
--- a/resources/scripts/helpers/download/grub
+++ b/resources/scripts/helpers/download/grub
@@ -29,7 +29,7 @@ set -u -e
 # Remove the old version that may still exist
 # -------------------------------------------------------------------------------
 
-echo "DOWNLOADING GRUB"
+printf "Downloading GRUB\n"
 
 rm -rf grub
 
@@ -72,7 +72,7 @@ git am "../resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-
 # git am "../resources/grub/patch/0003-syslinux_parse-keep-initrd-in-kernel-the-command-lin.patch"
 
 cd ../
-echo "FINISHED DOWNLOADING GRUB"
+printf "\n\n"
 
 # ------------------- DONE ----------------------
 
diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus
index c04c311..8b649b4 100755
--- a/resources/scripts/helpers/download/memtest86plus
+++ b/resources/scripts/helpers/download/memtest86plus
@@ -29,7 +29,7 @@ set -u -e
 # Remove the old version that may exist
 # ----------------------------------------------------------------------------------
 
-echo "DOWNLOADING MEMTEST86+"
+printf "Downloading MemTest86+\n"
 
 rm -rf "memtest86+-5.01"
 
@@ -64,7 +64,7 @@ cp ../resources/memtest86/patch/Makefile .
 # we're done
 cd ../
 
-echo "FINISHED DOWNLOADING MEMTEST86+"
+printf "\n\n"
 
 # ------------------- DONE ----------------------