From a4edcd82dc5405d8b58bf6ea2ddb6f928c059049 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Fri, 20 Feb 2015 03:15:20 +0000 Subject: bash scripts: Only enable verbose output if DEBUG= is used --- resources/scripts/helpers/build/clean/bucts | 3 ++- resources/scripts/helpers/build/clean/coreboot | 3 ++- resources/scripts/helpers/build/clean/flashrom | 3 ++- resources/scripts/helpers/build/clean/grub | 3 ++- resources/scripts/helpers/build/clean/i945pwm | 3 ++- resources/scripts/helpers/build/clean/ich9deblob | 3 ++- resources/scripts/helpers/build/clean/memtest86plus | 3 ++- resources/scripts/helpers/build/clean/rom_images | 3 ++- resources/scripts/helpers/build/external/source | 3 ++- resources/scripts/helpers/build/module/bucts | 3 ++- resources/scripts/helpers/build/module/coreboot | 3 ++- resources/scripts/helpers/build/module/flashrom | 3 ++- resources/scripts/helpers/build/module/grub | 3 ++- resources/scripts/helpers/build/module/i945pwm | 3 ++- resources/scripts/helpers/build/module/ich9deblob | 3 ++- resources/scripts/helpers/build/module/memtest86plus | 3 ++- resources/scripts/helpers/build/release/archives | 3 ++- resources/scripts/helpers/build/roms/helper | 3 ++- resources/scripts/helpers/build/roms/withgrub | 3 ++- resources/scripts/helpers/download/bucts | 3 ++- resources/scripts/helpers/download/coreboot | 3 ++- resources/scripts/helpers/download/flashrom | 3 ++- resources/scripts/helpers/download/grub | 3 ++- resources/scripts/helpers/download/memtest86plus | 3 ++- 24 files changed, 48 insertions(+), 24 deletions(-) (limited to 'resources/scripts/helpers') diff --git a/resources/scripts/helpers/build/clean/bucts b/resources/scripts/helpers/build/clean/bucts index eb907344..f84cd583 100755 --- a/resources/scripts/helpers/build/clean/bucts +++ b/resources/scripts/helpers/build/clean/bucts @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean bucts # -------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/coreboot b/resources/scripts/helpers/build/clean/coreboot index dd1cc0fa..4af73915 100755 --- a/resources/scripts/helpers/build/clean/coreboot +++ b/resources/scripts/helpers/build/clean/coreboot @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean coreboot utilities (dependencies for 'build'): # ------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/flashrom b/resources/scripts/helpers/build/clean/flashrom index 17054682..483ce4f6 100755 --- a/resources/scripts/helpers/build/clean/flashrom +++ b/resources/scripts/helpers/build/clean/flashrom @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean flashrom # -------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/grub b/resources/scripts/helpers/build/clean/grub index 6f3dccc4..b6e4f136 100755 --- a/resources/scripts/helpers/build/clean/grub +++ b/resources/scripts/helpers/build/clean/grub @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean grub # -------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/i945pwm b/resources/scripts/helpers/build/clean/i945pwm index 41334e6c..fa9aecf6 100755 --- a/resources/scripts/helpers/build/clean/i945pwm +++ b/resources/scripts/helpers/build/clean/i945pwm @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean i945-pwm utility # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/ich9deblob b/resources/scripts/helpers/build/clean/ich9deblob index fa5b6712..f3ee46a7 100755 --- a/resources/scripts/helpers/build/clean/ich9deblob +++ b/resources/scripts/helpers/build/clean/ich9deblob @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean ich9deblob utility # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/memtest86plus b/resources/scripts/helpers/build/clean/memtest86plus index cd01bdd2..8d4ede6f 100755 --- a/resources/scripts/helpers/build/clean/memtest86plus +++ b/resources/scripts/helpers/build/clean/memtest86plus @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # clean memtest86+ # -------------------------------------------------------- diff --git a/resources/scripts/helpers/build/clean/rom_images b/resources/scripts/helpers/build/clean/rom_images index 40bbe196..592b111e 100755 --- a/resources/scripts/helpers/build/clean/rom_images +++ b/resources/scripts/helpers/build/clean/rom_images @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of libreboot_src or libreboot git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Delete the ROM images # -------------------------------------------------------- diff --git a/resources/scripts/helpers/build/external/source b/resources/scripts/helpers/build/external/source index bff7b163..74cfdb3c 100755 --- a/resources/scripts/helpers/build/external/source +++ b/resources/scripts/helpers/build/external/source @@ -20,7 +20,8 @@ # along with this program. If not, see . # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # delete the old data rm -rf tobuild diff --git a/resources/scripts/helpers/build/module/bucts b/resources/scripts/helpers/build/module/bucts index f29d7536..6c596dd7 100755 --- a/resources/scripts/helpers/build/module/bucts +++ b/resources/scripts/helpers/build/module/bucts @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build BUC.TS utility (needed for flashing ROM's on X60/T60 while Lenovo BIOS is running) # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot index 4ec2eac0..3060e584 100755 --- a/resources/scripts/helpers/build/module/coreboot +++ b/resources/scripts/helpers/build/module/coreboot @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build utilities needed in coreboot directory # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/module/flashrom b/resources/scripts/helpers/build/module/flashrom index 7cd50cc0..7fe0fa7d 100755 --- a/resources/scripts/helpers/build/module/flashrom +++ b/resources/scripts/helpers/build/module/flashrom @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build "flashrom" (utility for flashing/dumping ROM's) # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/module/grub b/resources/scripts/helpers/build/module/grub index 1856c358..5138b476 100755 --- a/resources/scripts/helpers/build/module/grub +++ b/resources/scripts/helpers/build/module/grub @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build utilies needed for building GRUB payloads # --------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/module/i945pwm b/resources/scripts/helpers/build/module/i945pwm index 81cef713..c70c37e1 100755 --- a/resources/scripts/helpers/build/module/i945pwm +++ b/resources/scripts/helpers/build/module/i945pwm @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build i945-pwm utility # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/module/ich9deblob b/resources/scripts/helpers/build/module/ich9deblob index e77957cd..c0941ee3 100755 --- a/resources/scripts/helpers/build/module/ich9deblob +++ b/resources/scripts/helpers/build/module/ich9deblob @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build ich9deblob utility # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/module/memtest86plus b/resources/scripts/helpers/build/module/memtest86plus index f752080c..0b7686ee 100755 --- a/resources/scripts/helpers/build/module/memtest86plus +++ b/resources/scripts/helpers/build/module/memtest86plus @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build MemTest86+ payload (for GRUB) # -------------------------------------------------------------------- diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives index 451e7868..8b4bfcea 100755 --- a/resources/scripts/helpers/build/release/archives +++ b/resources/scripts/helpers/build/release/archives @@ -22,7 +22,8 @@ # This script assumes that the current working directory when running # it is the root directory of the libreboot git repository clone. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e arch="unknown" if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ] diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper index 0a4f06c6..d63598d7 100755 --- a/resources/scripts/helpers/build/roms/helper +++ b/resources/scripts/helpers/build/roms/helper @@ -21,7 +21,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e if (( $# != 1 )); then echo "Usage: ./buildrom-withgrub boardname" diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub index 9fa20e50..18cf62e0 100755 --- a/resources/scripts/helpers/build/roms/withgrub +++ b/resources/scripts/helpers/build/roms/withgrub @@ -22,7 +22,8 @@ # This script assumes that the working directory is the root # of libreboot_src or git -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Build the ROM images diff --git a/resources/scripts/helpers/download/bucts b/resources/scripts/helpers/download/bucts index 5d5e5d13..7e3f72d5 100755 --- a/resources/scripts/helpers/download/bucts +++ b/resources/scripts/helpers/download/bucts @@ -21,7 +21,8 @@ # This script assumes that the working directory is the # root of libreboot_src or libreboot git. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Get bucts and checkout last revision used diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot index 586f1c11..281d72c4 100755 --- a/resources/scripts/helpers/download/coreboot +++ b/resources/scripts/helpers/download/coreboot @@ -21,7 +21,8 @@ # This script assumes that the working directory is the # root of libreboot_src or libreboot git. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # This grabs current base used, and applies patches # This is also used to run the deblob scripts. diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom index 45f7a341..81e8caed 100755 --- a/resources/scripts/helpers/download/flashrom +++ b/resources/scripts/helpers/download/flashrom @@ -21,7 +21,8 @@ # This script assumes that the working directory is the # root of libreboot_src or libreboot git. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Get flashrom at the last previously tested revision diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub index 8dc512e4..6145293c 100755 --- a/resources/scripts/helpers/download/grub +++ b/resources/scripts/helpers/download/grub @@ -21,7 +21,8 @@ # This script assumes that the working directory is the # root of libreboot_src or libreboot git. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Get GRUB, revert to commit last used and apply patches. diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus index 37564ccf..c04c3115 100755 --- a/resources/scripts/helpers/download/memtest86plus +++ b/resources/scripts/helpers/download/memtest86plus @@ -21,7 +21,8 @@ # This script assumes that the working directory is the # root of libreboot_src or libreboot git. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e # Get the last version of MemTest86+ used, apply patches, build it. -- cgit v1.2.3-70-g09d2