diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-02-20 03:15:20 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-02-20 03:23:52 +0000 |
| commit | a4edcd82dc5405d8b58bf6ea2ddb6f928c059049 (patch) | |
| tree | 1e15f2eaf4eb3541d14ab5d057a411b47604744e | |
| parent | 2fe82322b537e39fa6e5fbc9fb0242c2b9a93c26 (diff) | |
| download | librebootfr-a4edcd82dc5405d8b58bf6ea2ddb6f928c059049.tar.gz librebootfr-a4edcd82dc5405d8b58bf6ea2ddb6f928c059049.zip | |
bash scripts: Only enable verbose output if DEBUG= is used
34 files changed, 71 insertions, 37 deletions
@@ -19,7 +19,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e build=./resources/scripts/helpers/build mode="unknown" @@ -19,7 +19,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e download=./resources/scripts/helpers/download programme="unknown" @@ -19,7 +19,8 @@ # ## Don't add here. errors are expected. -# set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +# set -u -e if [[ $EUID -ne 0 ]]; then echo "This script must be run as root" diff --git a/resources/scripts/dependencies/trisquel7dependencies b/resources/scripts/dependencies/trisquel7dependencies index 5330f754..f9c04be8 100755 --- a/resources/scripts/dependencies/trisquel7dependencies +++ b/resources/scripts/dependencies/trisquel7dependencies @@ -2,7 +2,7 @@ # for_trisquel7 script: installs build dependencies for Trisquel 7 # -# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e if [[ $EUID -ne 0 ]]; then echo "This script must be run as root" 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 <http://www.gnu.org/licenses/>. # -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. diff --git a/resources/scripts/misc/grub-background b/resources/scripts/misc/grub-background index 0fb721e8..cac4fed9 100755 --- a/resources/scripts/misc/grub-background +++ b/resources/scripts/misc/grub-background @@ -19,7 +19,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e if (( $# != 2 )); then echo "Usage: ./grub-background /path/to/libreboot.rom /path/to/image.jpg" diff --git a/resources/scripts/misc/ich9macchange b/resources/scripts/misc/ich9macchange index 353ab5f7..0c9a8f54 100755 --- a/resources/scripts/misc/ich9macchange +++ b/resources/scripts/misc/ich9macchange @@ -18,7 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e arch="unknown" if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]; then diff --git a/resources/scripts/misc/powertop.trisquel7 b/resources/scripts/misc/powertop.trisquel7 index c8478f20..670c3791 100755 --- a/resources/scripts/misc/powertop.trisquel7 +++ b/resources/scripts/misc/powertop.trisquel7 @@ -2,7 +2,7 @@ # powertop.trisquel7: automatically sets up powertop --auto-tune on startup in trisquel 7 # -# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e if [[ $EUID -ne 0 ]]; then echo "This script must be run as root" diff --git a/resources/utilities/coreboot-libre/deblob b/resources/utilities/coreboot-libre/deblob index ae2305bf..29b330e1 100755 --- a/resources/utilities/coreboot-libre/deblob +++ b/resources/utilities/coreboot-libre/deblob @@ -21,7 +21,8 @@ # This script assumes that the current working directory is the root # of the libreboot_src/ or git clone. -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e cd coreboot/ diff --git a/resources/utilities/coreboot-libre/findblobs b/resources/utilities/coreboot-libre/findblobs index 0d3027a8..f424d8d5 100755 --- a/resources/utilities/coreboot-libre/findblobs +++ b/resources/utilities/coreboot-libre/findblobs @@ -1,6 +1,7 @@ #!/bin/bash -set -e +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -e -u # This is used when updating the version of # coreboot that libreboot uses, to know what diff --git a/resources/utilities/grub-assemble/grub_memdisk_keymap b/resources/utilities/grub-assemble/grub_memdisk_keymap index 2ef01131..df25a0f7 100755 --- a/resources/utilities/grub-assemble/grub_memdisk_keymap +++ b/resources/utilities/grub-assemble/grub_memdisk_keymap @@ -3,7 +3,7 @@ # # lists keymaps # -# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -set -u -e -v +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e for keymap in $(ls keymap/original) do |