summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-06-10 20:30:48 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-06-10 20:30:48 (EDT)
commit12c50f7939c02db85f05830c4b9fccf464b3977a (patch)
tree42c0b72ee957cc2f70b442cefb14923b06cb8507 /resources
parent34270811fce1ecf0bcf3b1363b0dc3dbf284ab09 (diff)
downloadlibreboot-12c50f7939c02db85f05830c4b9fccf464b3977a.zip
libreboot-12c50f7939c02db85f05830c4b9fccf464b3977a.tar.gz
libreboot-12c50f7939c02db85f05830c4b9fccf464b3977a.tar.bz2
all script: use a standard style
Based on the style used for the script in resources/scripts/helpers/build/release/
Diffstat (limited to 'resources')
-rwxr-xr-xresources/scripts/helpers/build/clean/bucts4
-rwxr-xr-xresources/scripts/helpers/build/clean/coreboot8
-rwxr-xr-xresources/scripts/helpers/build/clean/flashrom8
-rwxr-xr-xresources/scripts/helpers/build/clean/grub6
-rwxr-xr-xresources/scripts/helpers/build/clean/i945pwm4
-rwxr-xr-xresources/scripts/helpers/build/clean/ich9deblob4
-rwxr-xr-xresources/scripts/helpers/build/clean/memtest86plus2
-rwxr-xr-xresources/scripts/helpers/build/clean/rom_images2
-rwxr-xr-xresources/scripts/helpers/build/config/corebootmodify18
-rwxr-xr-xresources/scripts/helpers/build/config/corebootreplace16
-rwxr-xr-xresources/scripts/helpers/build/config/corebootupdate18
-rwxr-xr-xresources/scripts/helpers/build/dependencies/parabola2
-rwxr-xr-xresources/scripts/helpers/build/dependencies/trisquel72
-rwxr-xr-xresources/scripts/helpers/build/module/bucts12
-rwxr-xr-xresources/scripts/helpers/build/module/coreboot8
-rwxr-xr-xresources/scripts/helpers/build/module/flashrom24
-rwxr-xr-xresources/scripts/helpers/build/module/grub6
-rwxr-xr-xresources/scripts/helpers/build/module/i945pwm4
-rwxr-xr-xresources/scripts/helpers/build/module/ich9deblob4
-rwxr-xr-xresources/scripts/helpers/build/module/memtest86plus4
-rwxr-xr-xresources/scripts/helpers/build/release/roms4
-rwxr-xr-xresources/scripts/helpers/build/release/src4
-rwxr-xr-xresources/scripts/helpers/build/roms/helper62
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub68
-rwxr-xr-xresources/scripts/helpers/download/bucts6
-rwxr-xr-xresources/scripts/helpers/download/coreboot60
-rwxr-xr-xresources/scripts/helpers/download/flashrom10
-rwxr-xr-xresources/scripts/helpers/download/grub6
-rwxr-xr-xresources/scripts/helpers/download/memtest86plus14
-rwxr-xr-xresources/scripts/misc/powertop.trisquel712
-rwxr-xr-xresources/utilities/coreboot-libre/deblob4
-rwxr-xr-xresources/utilities/coreboot-libre/findblobs26
-rwxr-xr-xresources/utilities/grub-assemble/gen.sh36
-rwxr-xr-xresources/utilities/grub-assemble/grub_memdisk_keymap2
34 files changed, 237 insertions, 233 deletions
diff --git a/resources/scripts/helpers/build/clean/bucts b/resources/scripts/helpers/build/clean/bucts
index 80fe3a8..2d3f9bb 100755
--- a/resources/scripts/helpers/build/clean/bucts
+++ b/resources/scripts/helpers/build/clean/bucts
@@ -29,12 +29,12 @@ set -u -e
printf "Cleaning the previous build of bucts\n"
-cd bucts/
+cd "bucts/"
make clean
printf "\n\n"
# done. go back to main directory.
-cd ../
+cd "../"
# ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/build/clean/coreboot b/resources/scripts/helpers/build/clean/coreboot
index b542989..1eb8ab3 100755
--- a/resources/scripts/helpers/build/clean/coreboot
+++ b/resources/scripts/helpers/build/clean/coreboot
@@ -29,7 +29,7 @@ set -u -e
printf "Cleaning the previous build of the utilities in coreboot\n"
-cd coreboot/
+cd "coreboot/"
# ----------------------
# clean coreboot itself:
@@ -40,11 +40,11 @@ make clean
# clean the utilities
# -------------------
# clean cbfstool
-cd util/cbfstool/
+cd "util/cbfstool/"
make clean
# go back to coreboot dir
-cd ../../
+cd "../../"
# -------------------------------------
# clean reference crossGCC for coreboot
@@ -53,7 +53,7 @@ cd ../../
make crossgcc-clean
# done. go back to main directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/clean/flashrom b/resources/scripts/helpers/build/clean/flashrom
index 41f5d28..d7eba90 100755
--- a/resources/scripts/helpers/build/clean/flashrom
+++ b/resources/scripts/helpers/build/clean/flashrom
@@ -29,15 +29,15 @@ set -u -e
printf "Cleaning the previous build of flashrom\n"
-cd flashrom/
+cd "flashrom/"
make clean
# remove patched binaries
-rm -f flashrom_lenovobios_sst
-rm -f flashrom_lenovobios_macronix
+rm -f "flashrom_lenovobios_sst"
+rm -f "flashrom_lenovobios_macronix"
# done. go back to main directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/clean/grub b/resources/scripts/helpers/build/clean/grub
index 9a806a2..cf22c8a 100755
--- a/resources/scripts/helpers/build/clean/grub
+++ b/resources/scripts/helpers/build/clean/grub
@@ -27,13 +27,13 @@ set -u -e
# clean grub
# --------------------------------------------------------
-cd grub/
+cd "grub/"
printf "Cleaning the previous build of GRUB\n"
-[[ -f Makefile ]] && make distclean
+[[ -f "Makefile" ]] && make distclean
# done. go back to main directoy
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/clean/i945pwm b/resources/scripts/helpers/build/clean/i945pwm
index ff383e8..1183859 100755
--- a/resources/scripts/helpers/build/clean/i945pwm
+++ b/resources/scripts/helpers/build/clean/i945pwm
@@ -28,9 +28,9 @@ set -u -e
# --------------------------------------------------------------------
printf "Cleaning the previous build of i945-pwm\n"
-cd resources/utilities/i945-pwm
+cd "resources/utilities/i945-pwm/"
make clean
-cd ../../../
+cd "../../../"
printf "\n\n"
# ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/build/clean/ich9deblob b/resources/scripts/helpers/build/clean/ich9deblob
index 04d971a..cfca981 100755
--- a/resources/scripts/helpers/build/clean/ich9deblob
+++ b/resources/scripts/helpers/build/clean/ich9deblob
@@ -28,9 +28,9 @@ set -u -e
# --------------------------------------------------------------------
printf "Cleaning the previous build of ich9deblob\n"
-cd resources/utilities/ich9deblob/
+cd "resources/utilities/ich9deblob/"
make clean
-cd ../../../
+cd "../../../"
printf "\n\n"
# ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/build/clean/memtest86plus b/resources/scripts/helpers/build/clean/memtest86plus
index 3ad8130..ad25915 100755
--- a/resources/scripts/helpers/build/clean/memtest86plus
+++ b/resources/scripts/helpers/build/clean/memtest86plus
@@ -34,7 +34,7 @@ cd "memtest86+-5.01"/
make clean
# done. go back to main directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/clean/rom_images b/resources/scripts/helpers/build/clean/rom_images
index 3a7d90c..e952d5c 100755
--- a/resources/scripts/helpers/build/clean/rom_images
+++ b/resources/scripts/helpers/build/clean/rom_images
@@ -28,7 +28,7 @@ set -u -e
# --------------------------------------------------------
# delete the bin/ directory
-rm -Rf bin/
+rm -Rf "bin/"
printf "Deleted the bin/ directory containing the ROM images.\n\n"
diff --git a/resources/scripts/helpers/build/config/corebootmodify b/resources/scripts/helpers/build/config/corebootmodify
index cb22008..bfb6a03 100755
--- a/resources/scripts/helpers/build/config/corebootmodify
+++ b/resources/scripts/helpers/build/config/corebootmodify
@@ -25,22 +25,22 @@
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
-cd resources/libreboot/config/
+cd "resources/libreboot/config/"
if [ $# -lt 1 ]; then
- configs=$(ls)
+ configs="$(ls)"
else
- configs=$@
+ configs="$@"
fi
-cd ../../../coreboot/
-for config in $configs; do
- printf "Updating config for $config\n"
+cd "../../../coreboot/"
+for config in ${configs}; do
+ printf "Updating config for %s\n" "${config}"
sleep 5
- mv ../resources/libreboot/config/$config/config .config
+ mv "../resources/libreboot/config/${config}/config" ".config"
make menuconfig
- mv .config ../resources/libreboot/config/$config/config
+ mv ".config" "../resources/libreboot/config/${config}/config"
done
-cd ../
+cd "../"
diff --git a/resources/scripts/helpers/build/config/corebootreplace b/resources/scripts/helpers/build/config/corebootreplace
index 9be5c9a..781c3bd 100755
--- a/resources/scripts/helpers/build/config/corebootreplace
+++ b/resources/scripts/helpers/build/config/corebootreplace
@@ -25,21 +25,21 @@
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
-cd resources/libreboot/config/
+cd "resources/libreboot/config/"
if [ $# -lt 1 ]; then
- configs=$(ls)
+ configs="$(ls)"
else
- configs=$@
+ configs="$@"
fi
-cd ../../../coreboot/
-for config in $configs; do
- printf "Updating config for $config\n"
+cd "../../../coreboot/"
+for config in ${configs}; do
+ printf "Updating config for %s\n" "${config}"
sleep 5
make menuconfig
- mv .config ../resources/libreboot/config/$config/config
+ mv ".config" "../resources/libreboot/config/${config}/config"
done
-cd ../
+cd "../"
diff --git a/resources/scripts/helpers/build/config/corebootupdate b/resources/scripts/helpers/build/config/corebootupdate
index 4e4db74..fa0a1fe 100755
--- a/resources/scripts/helpers/build/config/corebootupdate
+++ b/resources/scripts/helpers/build/config/corebootupdate
@@ -25,22 +25,22 @@
[ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e
-cd resources/libreboot/config/
+cd "resources/libreboot/config/"
if [ $# -lt 1 ]; then
- configs=$(ls)
+ configs="$(ls)"
else
- configs=$@
+ configs="$@"
fi
-cd ../../../coreboot/
-for config in $configs; do
- printf "Updating config for $config\n"
+cd "../../../coreboot/"
+for config in ${configs}; do
+ printf "Updating config for %s\n" "${config}"
sleep 5
- mv ../resources/libreboot/config/$config/config .config
+ mv "../resources/libreboot/config/${config}/config" ".config"
make oldconfig
- mv .config ../resources/libreboot/config/$config/config
+ mv ".config" "../resources/libreboot/config/${config}/config"
done
-cd ../
+cd "../"
diff --git a/resources/scripts/helpers/build/dependencies/parabola b/resources/scripts/helpers/build/dependencies/parabola
index 239f478..6d38429 100755
--- a/resources/scripts/helpers/build/dependencies/parabola
+++ b/resources/scripts/helpers/build/dependencies/parabola
@@ -24,7 +24,7 @@
set -u -e
if [[ $EUID -ne 0 ]]; then
- echo "This script must be run as root"
+ printf "This script must be run as root\n"
exit 1
fi
diff --git a/resources/scripts/helpers/build/dependencies/trisquel7 b/resources/scripts/helpers/build/dependencies/trisquel7
index f9c04be..0a3a268 100755
--- a/resources/scripts/helpers/build/dependencies/trisquel7
+++ b/resources/scripts/helpers/build/dependencies/trisquel7
@@ -22,7 +22,7 @@
set -u -e
if [[ $EUID -ne 0 ]]; then
- echo "This script must be run as root"
+ printf "This script must be run as root\n"
exit 1
fi
diff --git a/resources/scripts/helpers/build/module/bucts b/resources/scripts/helpers/build/module/bucts
index 34e1a37..8f2a49a 100755
--- a/resources/scripts/helpers/build/module/bucts
+++ b/resources/scripts/helpers/build/module/bucts
@@ -29,7 +29,7 @@ set -u -e
printf "Building bucts\n"
-cd bucts/
+cd "bucts/"
buildtype="unknown"
if (( $# != 1 )); then
@@ -38,19 +38,19 @@ else
buildtype="static"
fi
-if [ "$buildtype" = "static" ]; then
- patch Makefile < ../resources/bucts/patch/staticlink.diff
+if [ "${buildtype}" = "static" ]; then
+ patch "Makefile" < "../resources/bucts/patch/staticlink.diff"
fi
make clean
make
-if [ "$buildtype" = "static" ]; then
- patch Makefile -R < ../resources/bucts/patch/staticlink.diff
+if [ "${buildtype}" = "static" ]; then
+ patch "Makefile" -R < "../resources/bucts/patch/staticlink.diff"
fi
# done. go back to main directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot
index 5a6174f..3d93c8d 100755
--- a/resources/scripts/helpers/build/module/coreboot
+++ b/resources/scripts/helpers/build/module/coreboot
@@ -29,18 +29,18 @@ set -u -e
printf "Building the utilities in coreboot\n"
-cd coreboot
+cd "coreboot/"
# -----------------------------------------
# Build the utilities required by libreboot
# -----------------------------------------
# cbfstool
-cd util/cbfstool/
+cd "util/cbfstool/"
make
# done. go back to coreboot dir
-cd ../../
+cd "../../"
# -------------------------------------
# build reference crossGCC for coreboot
@@ -48,7 +48,7 @@ cd ../../
make crossgcc-i386
# done. go back to main libreboot_src directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/flashrom b/resources/scripts/helpers/build/module/flashrom
index a6cf612..0d2d1bf 100755
--- a/resources/scripts/helpers/build/module/flashrom
+++ b/resources/scripts/helpers/build/module/flashrom
@@ -29,20 +29,20 @@ set -u -e
printf "Building flashrom\n"
-cd flashrom/
+cd "flashrom/"
make clean
if (( $# != 1 )); then
make
else
- if [ "$1" = "static" ]; then
+ if [ "${1}" = "static" ]; then
make SHARED=0 CC='gcc -static'
else
make
fi
fi
-mv flashrom flashrom_normal
+mv "flashrom" "flashrom_normal"
# build patched binaries for MX25L1605D and SST25VF016B flash chips
# - these patches are needed for initial installation on an X60 or T60
@@ -50,18 +50,18 @@ mv flashrom flashrom_normal
for patchname in "lenovobios_macronix" "lenovobios_sst"
do
# first remove the existing build
- rm -f flashrom_"$patchname"
+ rm -f "flashrom_${patchname}"
# backup the unpatched flashchips.c (it will be patched)
- cp flashchips.c flashchips.c_
+ cp "flashchips.c" "flashchips.c_"
# patch flashchips.c
- patch flashchips.c < ../resources/flashrom/patch/"$patchname".diff
+ patch "flashchips.c" < "../resources/flashrom/patch/${patchname}.diff"
make clean
if (( $# != 1 )); then
make
else
- if [ "$1" = "static" ]; then
+ if [ "${1}" = "static" ]; then
make SHARED=0 CC='gcc -static'
else
make
@@ -69,16 +69,16 @@ do
fi
# Rename the binary based on the patch name
- mv flashrom flashrom_"$patchname"
+ mv "flashrom" "flashrom_${patchname}"
# restore unpatched flashchips.c
- rm -f flashchips.c
- mv flashchips.c_ flashchips.c
+ rm -f "flashchips.c"
+ mv "flashchips.c_" "flashchips.c"
done
-mv flashrom_normal flashrom
+mv "flashrom_normal" "flashrom"
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/grub b/resources/scripts/helpers/build/module/grub
index 73f36e7..e6b548a 100755
--- a/resources/scripts/helpers/build/module/grub
+++ b/resources/scripts/helpers/build/module/grub
@@ -29,10 +29,10 @@ set -u -e
printf "Building GRUB\n"
-cd grub/
+cd "grub/"
# clean it first
-[[ -f Makefile ]] && make clean
+[[ -f Makefile ]] && make distclean
# build grub
./autogen.sh
@@ -42,6 +42,6 @@ make
printf "\n\n"
# done. go back to main directory
-cd ../
+cd "../"
# ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/build/module/i945pwm b/resources/scripts/helpers/build/module/i945pwm
index 657a7b4..0c5200c 100755
--- a/resources/scripts/helpers/build/module/i945pwm
+++ b/resources/scripts/helpers/build/module/i945pwm
@@ -29,14 +29,14 @@ set -u -e
printf "Building i945-pwm\n"
-cd resources/utilities/i945-pwm/
+cd "resources/utilities/i945-pwm/"
make clean
# build it
make
# done. go back to main directory
-cd ../../../
+cd "../../../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/ich9deblob b/resources/scripts/helpers/build/module/ich9deblob
index 25cf97b..d1d0d2f 100755
--- a/resources/scripts/helpers/build/module/ich9deblob
+++ b/resources/scripts/helpers/build/module/ich9deblob
@@ -29,7 +29,7 @@ set -u -e
printf "Building ich9deblob\n"
-cd resources/utilities/ich9deblob
+cd "resources/utilities/ich9deblob/"
# clean it first
make clean
@@ -38,7 +38,7 @@ make clean
make
# done. go back to main directory
-cd ../../../
+cd "../../../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/memtest86plus b/resources/scripts/helpers/build/module/memtest86plus
index d6f52ef..8fd9c1d 100755
--- a/resources/scripts/helpers/build/module/memtest86plus
+++ b/resources/scripts/helpers/build/module/memtest86plus
@@ -29,7 +29,7 @@ set -u -e
printf "Building MemTest86+\n"
-cd "memtest86+-5.01"/
+cd "memtest86+-5.01/"
# clean it first
make clean
@@ -38,7 +38,7 @@ make clean
make
# done. go back to main directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms
index 2f46f39..0a840a9 100755
--- a/resources/scripts/helpers/build/release/roms
+++ b/resources/scripts/helpers/build/release/roms
@@ -43,7 +43,7 @@ distname="libreboot_${version}"
printf 'Building ROM image release archives for...\n'
-cd bin/
+cd "bin/"
for board in *; do
printf '...%s' "${board}"
@@ -61,6 +61,6 @@ for board in *; do
printf ' OK\n'
done
-cd ../
+cd "../"
printf 'ROM image release archives are stored in %s/\n' "${romdir}"
diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src
index f2be4fb..c930395 100755
--- a/resources/scripts/helpers/build/release/src
+++ b/resources/scripts/helpers/build/release/src
@@ -107,6 +107,10 @@ rm -f "${distdir}/mkgbe.h"
rm -f "${distdir}/ich9fdgbe_8m.bin"
rm -f "${distdir}/ich9fdgbe_4m.bin"
+# Remove any GRUB payload ELF executables that may exist
+rm -f "${distdir}/resources/utilities/grub-assemble/grub_txtmode.elf"
+rm -f "${distdir}/resources/utilities/grub-assemble/grub_vesafb.elf"
+
printf 'Creating %s.tar.xz\n' "${distdir}"
(cd "${versiondir}/" && tar -c "${distname}/" | xz -9e >"${distname}.tar.xz")
diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper
index 82fd518..ada0029 100755
--- a/resources/scripts/helpers/build/roms/helper
+++ b/resources/scripts/helpers/build/roms/helper
@@ -25,15 +25,15 @@
set -u -e
if (( $# != 1 )); then
- echo "Usage: ./buildrom-withgrub boardname"
- echo "Example: ./buildrom-withgrub x60"
- echo "You need to specify exactly 1 argument"
+ printf "Usage: ./buildrom-withgrub boardname\n"
+ printf "Example: ./buildrom-withgrub x60\n"
+ printf "You need to specify exactly 1 argument\n"
exit 1
fi
-printf "Helper script: build ROM images for '$1'\n"
+printf "Helper script: build ROM images for '%s'\n" "${1}"
-cd coreboot/
+cd "coreboot/"
if [ -f "../version" ]; then
# _src release archive is being used
@@ -47,30 +47,30 @@ printf '%s\n' "${version}" >"lbversion"
# Build ROM images with text-mode and corebootfb modes.
# ---------------------------------------------------------------------------------------------------------------
-if [ "$1" = "qemu_i440fx_piix4" ] || [ "$1" = "qemu_q35_ich9" ]
+if [ "${1}" = "qemu_i440fx_piix4" ] || [ "${1}" = "qemu_q35_ich9" ]
then
# assume that the default config enable framebuffer mode, duplicate and patch for text-mode
# necessary, otherwise it will ask you to enter the Y/X resolution of the framebuffer at build time
- cp ../resources/libreboot/config/"$1"/config config_vesafb
- sed 's/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/' < config_vesafb > config_txtmode
+ cp "../resources/libreboot/config/${1}/config" "config_vesafb"
+ sed 's/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/' < "config_vesafb" > "config_txtmode"
else
# assume that the default config enables text-mode, duplicate and patch for framebuffer mode
- cp ../resources/libreboot/config/"$1"/config config_txtmode
- sed 's/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/' < config_txtmode > config_vesafb
+ cp "../resources/libreboot/config/${1}/config" "config_txtmode"
+ sed 's/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/' < "config_txtmode" > "config_vesafb"
fi
for romtype in txtmode vesafb
do
# skip building txtmode roms for now (memtest86 is broken)
# todo: make a new release ASAP, with memtest86+ working again, and text-mode working on GM45
- if [ "$romtype" = "txtmode" ]; then
+ if [ "${romtype}" = "txtmode" ]; then
# TODO: remove this if, once you get memtest86+ working again
continue
fi
- if [ "$1" = "x200_8mb" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t500_8mb" ] || [ "$1" = "t500_4mb" ]
+ if [ "${1}" = "x200_8mb" ] || [ "${1}" = "x200_4mb" ] || [ "${1}" = "r400_8mb" ] || [ "${1}" = "r400_4mb" ] || [ "${1}" = "t400_8mb" ] || [ "${1}" = "t400_4mb" ] || [ "${1}" = "t500_8mb" ] || [ "${1}" = "t500_4mb" ]
then
- if [ "$romtype" = "txtmode" ]
+ if [ "${romtype}" = "txtmode" ]
then
printf "Text mode graphics is currently broken on X200, R400, T400 and T500. Only framebuffer mode works.\n"
printf "TODO: offending coreboot commit found (see docs/release.html). Fix text-mode graphics initialization.\n"
@@ -80,25 +80,25 @@ do
# Build coreboot ROM image
make clean
- mv config_"$romtype" .config
- mv grub_"$romtype".elf grub.elf
+ mv "config_${romtype}" ".config"
+ mv "grub_${romtype}.elf" "grub.elf"
make
- mv grub.elf grub_"$romtype".elf
- mv build/coreboot.rom "$1"_"$romtype".rom
+ mv "grub.elf" "grub_${romtype}.elf"
+ mv "build/coreboot.rom" "${1}_${romtype}.rom"
# .config no longer needed
- rm -f .config
+ rm -f ".config"
# Add version information to this image
- ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f lbversion -n lbversion -t raw
+ ./util/cbfstool/cbfstool ${1}_${romtype}.rom add -f lbversion -n lbversion -t raw
# Add the background image
if [ "$romtype" = "vesafb" ]
then
if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ]
then
- ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background1280x800.png -n background.png -t raw
+ ./util/cbfstool/cbfstool ${1}_${romtype}.rom add -f ../resources/grub/background/background1280x800.png -n background.png -t raw
else
- ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background1024x768.png -n background.png -t raw
+ ./util/cbfstool/cbfstool ${1}_${romtype}.rom add -f ../resources/grub/background/background1024x768.png -n background.png -t raw
fi
fi
@@ -106,37 +106,37 @@ do
for keymap in $(ls ../resources/utilities/grub-assemble/keymap/original)
do
# copy the images based on the keymap
- cp "$1"_"$romtype".rom "$1"_"$keymap"_"$romtype".rom
+ cp "${1}_${romtype}.rom" "${1}_${keymap}_${romtype}.rom"
# Insert grub config into the image
- ./util/cbfstool/cbfstool "$1"_"$keymap"_"$romtype".rom add -f grub_"$keymap"_"$romtype".cfg -n grub.cfg -t raw
+ ./util/cbfstool/cbfstool ${1}_${keymap}_${romtype}.rom add -f grub_${keymap}_${romtype}.cfg -n grub.cfg -t raw
# Insert grub test config into the image (for the user to test modifications to before modifying the main one)
- ./util/cbfstool/cbfstool "$1"_"$keymap"_"$romtype".rom add -f grub_"$keymap"_"$romtype"_test.cfg -n grubtest.cfg -t raw
+ ./util/cbfstool/cbfstool ${1}_${keymap}_${romtype}.rom add -f grub_${keymap}_${romtype}_test.cfg -n grubtest.cfg -t raw
done
# This config-less ROM is no longer needed
- rm -Rf "$1"_"$romtype".rom
+ rm -f "${1}_${romtype}.rom"
done
# Now we clean up and prepare the bin directory containing all the images
# ----------------------------------------------------------------------------------------------------------------------------
# prepare directory for new ROM images
-rm -Rf "$1"
-mkdir "$1"
+rm -Rf "${1}/"
+mkdir "${1}/"
# move the ROM's into the newly created directory
-mv "$1"*rom "$1"
+mv "${1}"*.rom "${1}/"
# delete the old ROM's from ../bin
-rm -Rf ../bin/"$1"
+rm -Rf "../bin/${1}/"
# now put the new ROM's in ./bin
-mv "$1" ../bin
+mv "${1}/" "../bin"
# libreboot version file no longer needed
rm -f "lbversion"
# go back to main source directory
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub
index 6c1c8fa..c3b33c5 100755
--- a/resources/scripts/helpers/build/roms/withgrub
+++ b/resources/scripts/helpers/build/roms/withgrub
@@ -27,9 +27,9 @@ set -u -e
printf "Building ROM images with the GRUB payload\n"
-if [ ! -d "bin" ]
+if [ ! -d "bin/" ]
then
- mkdir bin/
+ mkdir "bin/"
fi
boards="unknown"
@@ -44,71 +44,71 @@ fi
# Put GRUB payloads and config files
# in the coreboot directory, ready for next step
-cd coreboot/
+cd "coreboot/"
for romtype in txtmode vesafb
do
- cd ../resources/utilities/grub-assemble
- ./gen.sh "$romtype"
- rm -f ../../../coreboot/grub_"$romtype".elf
- mv grub_"$romtype".elf ../../../coreboot/
- cd ../../../coreboot
+ cd "../resources/utilities/grub-assemble"
+ ./gen.sh ${romtype}
+ rm -f "../../../coreboot/grub_${romtype}.elf"
+ mv "grub_${romtype}.elf" "../../../coreboot/"
+ cd "../../../coreboot"
# GRUB configuration files
- for keymap in $(ls ../resources/utilities/grub-assemble/keymap/original)
+ for keymap in $(ls "../resources/utilities/grub-assemble/keymap/original/")
do
- cat ../resources/grub/config/extra/common.cfg > grub_"$keymap"_"$romtype".cfg
- cat ../resources/grub/config/extra/"$romtype".cfg >> grub_"$keymap"_"$romtype".cfg
- echo "keymap $keymap" >> grub_"$keymap"_"$romtype".cfg
- cat ../resources/grub/config/menuentries/common.cfg >> grub_"$keymap"_"$romtype".cfg
- cat ../resources/grub/config/menuentries/"$romtype".cfg >> grub_"$keymap"_"$romtype".cfg
+ cat "../resources/grub/config/extra/common.cfg" > "grub_${keymap}_${romtype}.cfg"
+ cat "../resources/grub/config/extra/${romtype}.cfg" >> "grub_${keymap}_${romtype}.cfg"
+ printf "keymap %s\n" "${keymap}" >> "grub_${keymap}_${romtype}.cfg"
+ cat "../resources/grub/config/menuentries/common.cfg" >> "grub_${keymap}_${romtype}.cfg"
+ cat "../resources/grub/config/menuentries/${romtype}.cfg" >> "grub_${keymap}_${romtype}.cfg"
# grubtest.cfg should be able to switch back to grub.cfg
- sed 's/grubtest.cfg/grub.cfg/' < grub_"$keymap"_"$romtype".cfg > grub_"$keymap"_"$romtype"_test.cfg
+ sed 's/grubtest.cfg/grub.cfg/' < "grub_${keymap}_${romtype}.cfg" > "grub_${keymap}_${romtype}_test.cfg"
done
done
cd ../
# Build ROM images for supported boards
-for board in $boards
+for board in ${boards}
do
- if [ -f resources/libreboot/config/"$board"/config ]; then
- ./build roms helper $board
+ if [ -f "resources/libreboot/config/${board}/config" ]; then
+ ./build roms helper ${board}
fi
done
# Needed on i945 systems for the bucts/dd trick (documented)
# This enables the ROM to be flashed over the lenovo bios firmware
-for i945board in x60 t60
+for i945board in "x60" "t60"
do
- if [ -d bin/"$i945board"/ ]; then
- cd bin/"$i945board"/
+ if [ -d "bin/${i945board}/" ]; then
+ cd "bin/${i945board}/"
for i945rom in $(ls)
do
- dd if="$i945rom" of=top64k.bin bs=1 skip=$[$(stat -c %s "$i945rom") - 0x10000] count=64k
- dd if=top64k.bin of="$i945rom" bs=1 seek=$[$(stat -c %s "$i945rom") - 0x20000] count=64k conv=notrunc
+ dd if="${i945rom}" of=top64k.bin bs=1 skip=$[$(stat -c %s "${i945rom}") - 0x10000] count=64k
+ dd if=top64k.bin of="${i945rom}" bs=1 seek=$[$(stat -c %s "${i945rom}") - 0x20000] count=64k conv=notrunc
rm -f top64k.bin
done
- cd ../../
+ cd "../../"
fi
done
# Build the deblobbed descriptor+gbe regions for GM45/ICH9M targets.
# Then put them in the ROM images.
-if [ -d bin/ ]; then
- cd bin/
+if [ -d "bin/" ]; then
+ cd "bin/"
for board in "x200" "r400" "t400" "t500"
do
for romsize in "4m" "8m"
do
- if [ -d "$board"_"$romsize"b/ ]; then
- cd "$board"_"$romsize"b/
+ if [ -d "${board}_${romsize}b/" ]; then
+ cd "${board}_${romsize}b/"
../../resources/utilities/ich9deblob/ich9gen
for rom in $(ls)
do
- dd if=ich9fdgbe_"$romsize".bin of="$rom" bs=1 count=12k conv=notrunc
+ dd if="ich9fdgbe_${romsize}.bin" of="${rom}" bs=1 count=12k conv=notrunc
done
- rm -f ich9fdgbe_4m.bin
- rm -f ich9fdgbe_8m.bin
- cd ../
+ rm -f "ich9fdgbe_4m.bin"
+ rm -f "ich9fdgbe_8m.bin"
+ cd "../"
fi
done
done
@@ -116,8 +116,8 @@ if [ -d bin/ ]; then
fi
# The GRUB payloads are no longer needed
-rm -f coreboot/grub_vesafb.elf
-rm -f coreboot/grub_txtmode.elf
+rm -f "coreboot/grub_vesafb.elf"
+rm -f "coreboot/grub_txtmode.elf"
# The GRUB configs are no longer needed
rm -f coreboot/grub*cfg
diff --git a/resources/scripts/helpers/download/bucts b/resources/scripts/helpers/download/bucts
index 2fc543f..9448965 100755
--- a/resources/scripts/helpers/download/bucts
+++ b/resources/scripts/helpers/download/bucts
@@ -31,7 +31,7 @@ set -u -e
printf "Downloading bucts\n"
-rm -Rf bucts
+rm -Rf "bucts/"
# Get bucts
# ------------------------------------------------------------------------------
@@ -40,7 +40,7 @@ rm -Rf bucts
git clone git://git.stuge.se/bucts.git
# modifications are required
-cd bucts
+cd "bucts/"
# Reset to the last commit that was tested
# ------------------------------------------------------------------------------
@@ -50,7 +50,7 @@ git reset --hard dc27919d7a66a6e8685ce07c71aefa4f03ef7c07
git am "../resources/bucts/patch/0001-Makefile-don-t-use-git.patch"
# we're done
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index 0df86a7..c923fb2 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -32,7 +32,7 @@ printf "Downloading coreboot, patching coreboot and deblobbing coreboot\n"
# Remove the old version that may exist
# ------------------------------------------------------------------------------
-rm -Rf coreboot
+rm -Rf "coreboot/"
# Get latest coreboot:
# ------------------------------------------------------------------------------
@@ -41,7 +41,7 @@ rm -Rf coreboot
git clone http://review.coreboot.org/coreboot
# there are modifications required
-cd coreboot/
+cd "coreboot/"
# reset to previously tested revision
git reset --hard e19c8b0091022ae3f490601aed0c290cd5171b79
@@ -53,17 +53,17 @@ git reset --hard e19c8b0091022ae3f490601aed0c290cd5171b79
printf "Downloading patches for T400 (hybrid graphics and other fixes)"
# git fetch http://review.coreboot.org/coreboot refs/changes/31/9331/7 && git checkout FETCH_HEAD
-git am ../resources/libreboot/patch/0001-src-southbridge-intel-i82801ix-Add-GPIO-register-loc.patch
-git am ../resources/libreboot/patch/0002-northbridge-intel-gm45-gma-Add-backlight-control-reg.patch
-git am ../resources/libreboot/patch/0003-northbridge-intel-gm45-gma-Minor-cleanup.patch
-git am ../resources/libreboot/patch/0004-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch
-git am ../resources/libreboot/patch/0005-mainboard-lenovo-x200-Use-defines-from-southbridge-f.patch
-git am ../resources/libreboot/patch/0006-mainboard-lenovo-x200-Add-power_on_after_fail-NVRAM-.patch
-git am ../resources/libreboot/patch/0007-mainboards-lenovo-Copy-X200-board-to-T400-for-future.patch
-git am ../resources/libreboot/patch/0008-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch
-git am ../resources/libreboot/patch/0009-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
-git am ../resources/libreboot/patch/0010-mainboard-lenovo-t400-Add-initial-ATPX-ACPI-implemen.patch
-git am ../resources/libreboot/patch/0011-mainboard-lenovo-t400-Increase-backlight-frequency-t.patch
+git am "../resources/libreboot/patch/0001-src-southbridge-intel-i82801ix-Add-GPIO-register-loc.patch"
+git am "../resources/libreboot/patch/0002-northbridge-intel-gm45-gma-Add-backlight-control-reg.patch"
+git am "../resources/libreboot/patch/0003-northbridge-intel-gm45-gma-Minor-cleanup.patch"
+git am "../resources/libreboot/patch/0004-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch"
+git am "../resources/libreboot/patch/0005-mainboard-lenovo-x200-Use-defines-from-southbridge-f.patch"
+git am "../resources/libreboot/patch/0006-mainboard-lenovo-x200-Add-power_on_after_fail-NVRAM-.patch"
+git am "../resources/libreboot/patch/0007-mainboards-lenovo-Copy-X200-board-to-T400-for-future.patch"
+git am "../resources/libreboot/patch/0008-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch"
+git am "../resources/libreboot/patch/0009-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch"
+git am "../resources/libreboot/patch/0010-mainboard-lenovo-t400-Add-initial-ATPX-ACPI-implemen.patch"
+git am "../resources/libreboot/patch/0011-mainboard-lenovo-t400-Increase-backlight-frequency-t.patch"
# Downloads these patches:
# http://review.coreboot.org/#/c/9318/
@@ -80,33 +80,33 @@ git am ../resources/libreboot/patch/0011-mainboard-lenovo-t400-Increase-backligh
# Related - hard-code enable integrated-only GPU (GM45):
# git fetch http://review.coreboot.org/coreboot refs/changes/90/10090/2 && git cherry-pick FETCH_HEAD
-git am ../resources/libreboot/patch/0012-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
+git am "../resources/libreboot/patch/0012-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch"
# ----
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
-git am ../resources/libreboot/patch/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch
+git am "../resources/libreboot/patch/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch"
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
-git am ../resources/libreboot/patch/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch
+git am "../resources/libreboot/patch/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch"
printf "Enable T60 native graphics\n"
# git fetch http://review.coreboot.org/coreboot refs/changes/45/5345/9 && git cherry-pick FETCH_HEAD
-git am ../resources/libreboot/patch/0015-lenovo-t60-Enable-native-intel-gfx-init.patch
+git am "../resources/libreboot/patch/0015-lenovo-t60-Enable-native-intel-gfx-init.patch"
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
-git am ../resources/libreboot/patch/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch
+git am "../resources/libreboot/patch/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch"
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
-git am ../resources/libreboot/patch/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch
+git am "../resources/libreboot/patch/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch"
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
-git am ../resources/libreboot/patch/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
+git am "../resources/libreboot/patch/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch"
# 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
@@ -116,36 +116,36 @@ git am ../resources/libreboot/patch/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoin
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
-git am ../resources/libreboot/patch/0019-NOTFORMERGE-northbridge-gm45-raminit.c-enable-GS45-h.patch
+git am "../resources/libreboot/patch/0019-NOTFORMERGE-northbridge-gm45-raminit.c-enable-GS45-h.patch"
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
-git am ../resources/libreboot/patch/0020-gm45-fix-uneven-backlight-native-gfx-init.patch
+git am "../resources/libreboot/patch/0020-gm45-fix-uneven-backlight-native-gfx-init.patch"
printf "ThinkPad R400 support (clone of the T400)\n"
# git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/3 && git cherry-pick FETCH_HEAD
-git am ../resources/libreboot/patch/0021-lenovo-r400-Add-clone-of-Lenovo-T400.patch
+git am "../resources/libreboot/patch/0021-lenovo-r400-Add-clone-of-Lenovo-T400.patch"
printf "ThinkPad T500 (depends on T400 patch)\n"
# git fetch http://review.coreboot.org/coreboot refs/changes/81/9181/2 && git cherry-pick FETCH_HEAD
-git am ../resources/libreboot/patch/0022-New-mainboard-Lenovo-T500.patch
+git am "../resources/libreboot/patch/0022-New-mainboard-Lenovo-T500.patch"
# BACKPORTED
# This was merged in master, but this is an older revision. For now, simply backport it (X200 digitizer patch)
printf "ThinkPad X200 Tablet digitizer patch (backported)\n"
# git fetch http://review.coreboot.org/coreboot refs/changes/08/10208/4 && git cherry-pick FETCH_HEAD
-git am ../resources/libreboot/patch/0023-lenovo-x200-Enable-wacom-digitizer-support-for-x200t.patch
+git am "../resources/libreboot/patch/0023-lenovo-x200-Enable-wacom-digitizer-support-for-x200t.patch"
# Run coreboot-libre deblob scripts
# ------------------------------------------------------------------------------
printf "Deleting .git* in coreboot/ (history inside .git contains the blobs that were deleted)\n"
-rm -Rf .git
-rm -f .gitreview
-rm -f .gitmodules
-rm -f .gitignore
+rm -Rf ".git/"
+rm -f ".gitreview"
+rm -f ".gitmodules"
+rm -f ".gitignore"
-cd ../
+cd "../"
printf "Deblobbing coreboot\n"
./resources/utilities/coreboot-libre/deblob
diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom
index 093aac8..8006432 100755
--- a/resources/scripts/helpers/download/flashrom
+++ b/resources/scripts/helpers/download/flashrom
@@ -31,7 +31,7 @@ set -u -e
printf "Downloading flashrom\n"
-rm -Rf flashrom
+rm -Rf "flashrom/"
# Get flashrom
# ------------------------------------------------------------------------------
@@ -41,18 +41,18 @@ svn co -r 1889 svn://flashrom.org/flashrom/trunk flashrom
# apply patches
-cd flashrom/
+cd "flashrom/"
printf "Enabling whitelist for X200S, X200 Tablet, T400, T500 and R400\n"
-patch board_enable.c < ../resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.diff
+patch "board_enable.c" < "../resources/flashrom/patch/x200s_x200t_t400_t500_r400_whitelist.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
+patch "flashchips.c" < "../resources/flashrom/patch/purged_chips.diff"
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index e35d731..70835f2 100755
--- a/resources/scripts/helpers/download/grub
+++ b/resources/scripts/helpers/download/grub
@@ -31,7 +31,7 @@ set -u -e
printf "Downloading GRUB\n"
-rm -Rf grub
+rm -Rf "grub/"
# Get latest GRUB
# ------------------------------------------------------------------------------
@@ -40,7 +40,7 @@ rm -Rf grub
git clone git://git.savannah.gnu.org/grub.git
# modifications are required
-cd grub
+cd "grub/"
# Reset to the last commit that was tested
# ------------------------------------------------------------------------------
@@ -58,7 +58,7 @@ git am "../resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-
# https://people.torproject.org/~lunar/volatile/2015-03-17-e3Yp1d7FifQ/0001-lib-syslinux_parse-add-support-for-vesa-menu.c32.patch
git am "../resources/grub/patch/0002-lib-syslinux_parse-add-support-for-vesa-menu.c32.patch"
-cd ../
+cd "../"
printf "\n\n"
# ------------------- DONE ----------------------
diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus
index 9fa20dd..c478122 100755
--- a/resources/scripts/helpers/download/memtest86plus
+++ b/resources/scripts/helpers/download/memtest86plus
@@ -32,7 +32,7 @@ set -u -e
printf "Downloading MemTest86+\n"
-rm -Rf "memtest86+-5.01"
+rm -Rf "memtest86+-5.01/"
# Get latest memtest86+:
# ------------------------------------------------------------------------------
@@ -47,23 +47,23 @@ tar -xzf "memtest86+-5.01.tar.gz"
rm -f "memtest86+-5.01.tar.gz"
# there are modifications required
-cd "memtest86+-5.01"/
+cd "memtest86+-5.01/"
# Apply necessary patches
# ------------------------------------------------------------------------------
# place the right config
-rm -f config.h
-cp ../resources/memtest86/patch/config.h .
+rm -f "config.h"
+cp "../resources/memtest86/patch/config.h" .
# place the right Makefile
-rm -f Makefile
-cp ../resources/memtest86/patch/Makefile .
+rm -f "Makefile"
+cp "../resources/memtest86/patch/Makefile" .
# (diff them with defaults to see what changed)
# we're done
-cd ../
+cd "../"
printf "\n\n"
diff --git a/resources/scripts/misc/powertop.trisquel7 b/resources/scripts/misc/powertop.trisquel7
index 670c379..25bb597 100755
--- a/resources/scripts/misc/powertop.trisquel7
+++ b/resources/scripts/misc/powertop.trisquel7
@@ -22,7 +22,7 @@
set -u -e
if [[ $EUID -ne 0 ]]; then
- echo "This script must be run as root"
+ printf "This script must be run as root\n"
exit 1
fi
@@ -33,19 +33,19 @@ apt-get -y install powertop
# Remove startup symlink if it exists
update-rc.d powertop remove
# Remove previous file if it exists
-rm -rf /etc/init.d/powertop
+rm -Rf "/etc/init.d/powertop"
# write the correct commands there:
-echo "#!/bin/sh" > /etc/init.d/powertop
-echo "/usr/sbin/powertop --auto-tune" >> /etc/init.d/powertop
+printf "#!/bin/sh\n" > "/etc/init.d/powertop"
+printf "/usr/sbin/powertop --auto-tune\n" >> "/etc/init.d/powertop"
# make it executable:
-chmod +x /etc/init.d/powertop
+chmod +x "/etc/init.d/powertop"
# Add the service to make it run automatically at boot time:
update-rc.d powertop defaults
# Run powertop now and tell the user
powertop --auto-tune
-echo "Done. Run 'powertop --auto-tune' now. This will also run automatically at boot time. Run it again at any time, if needed. This has also been done for you just now."
+printf "Done. Run 'powertop --auto-tune' now. This will also run automatically at boot time. Run it again at any time, if needed. This has also been done for you just now.\n"
diff --git a/resources/utilities/coreboot-libre/deblob b/resources/utilities/coreboot-libre/deblob
index 26fb75f..3ca64bb 100755
--- a/resources/utilities/coreboot-libre/deblob
+++ b/resources/utilities/coreboot-libre/deblob
@@ -26,7 +26,7 @@ set -u -e
printf "Deleting blobs in coreboot\n"
-cd coreboot/
+cd "coreboot/"
# ---------------------
# Intel SoC (broadwell): CPU microcode updates
@@ -161,4 +161,4 @@ rm -f \
printf "\n\n"
-cd ../
+cd "../"
diff --git a/resources/utilities/coreboot-libre/findblobs b/resources/utilities/coreboot-libre/findblobs
index 7d9b5b0..4fcda2a 100755
--- a/resources/utilities/coreboot-libre/findblobs
+++ b/resources/utilities/coreboot-libre/findblobs
@@ -30,29 +30,29 @@ set -e -u
# this will have to do.
printf "Searching for blobs in coreboot\n"
-cp deblob-check ../../../coreboot
-cd ../../../coreboot/
+cp "deblob-check" "../../../coreboot"
+cd "../../../coreboot/"
-chmod +x deblob-check
-find -type f | xargs ./deblob-check > blobs
-rm -f deblob-check
+chmod +x "deblob-check"
+find -type f | xargs ./deblob-check > "blobs"
+rm -f "deblob-check"
-rm -f tocheck
-touch tocheck
+rm -f "tocheck"
+touch "tocheck"
for file in $(cat blobs)
do
- if ! grep -Fxq "$file" ../resources/utilities/coreboot-libre/nonblobs
+ if ! grep -Fxq "${file}" "../resources/utilities/coreboot-libre/nonblobs"
then
- echo "$file" >> tocheck
+ printf "%s\n" "${file}" >> tocheck
fi
done
-rm -f blobs
+rm -f "blobs"
-rm -f ../resources/utilities/coreboot-libre/tocheck
-mv tocheck ../resources/utilities/coreboot-libre
+rm -f "../resources/utilities/coreboot-libre/tocheck"
+mv "tocheck" "../resources/utilities/coreboot-libre/"
-cd ../resources/utilities/coreboot-libre
+cd "../resources/utilities/coreboot-libre/"
printf "Done! open resources/utilities/coreboot-libre/tocheck in an editor\n"
printf "This will contain the names of the files that you must decide whether they are blobs or not\n\n"
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh
index 8174939..3dfed2c 100755
--- a/resources/utilities/grub-assemble/gen.sh
+++ b/resources/utilities/grub-assemble/gen.sh
@@ -11,10 +11,10 @@
set -u -e
if (( $# != 1 )); then
- echo "Usage: ./gen.sh mode"
- echo "Example: ./gen.sh vesafb"
- echo "Example: ./gen.sh txtmode"
- echo "You need to specify exactly 1 argument"
+ printf "Usage: ./gen.sh mode\n"
+ printf "Example: ./gen.sh vesafb\n"
+ printf "Example: ./gen.sh txtmode\n"
+ printf "You need to specify exactly 1 argument\n"
exit 1
fi
@@ -24,36 +24,36 @@ grubdir="../../../grub"
source "modules.conf"
printf "Creating GRUB ELF executable for configuration '$1'\n"
-if [ "$1" = "vesafb" ]
+if [ "${1}" = "vesafb" ]
then
# Generate the grub.elf (vesafb)
$grubdir/grub-mkstandalone \
- --grub-mkimage=$grubdir/grub-mkimage \
+ --grub-mkimage="${grubdir}/grub-mkimage" \
-O i386-coreboot \
- -o grub_vesafb.elf \
- -d $grubdir/grub-core/ \
+ -o "grub_vesafb.elf" \
+ -d "${grubdir}/grub-core/" \
--fonts= --themes= --locales= \
- --modules="$grub_modules" \
- --install-modules="$grub_install_modules" \
+ --modules="${grub_modules}" \
+ --install-modules="${grub_install_modules}" \
/boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
/dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \
$(./grub_memdisk_keymap)
-elif [ "$1" = "txtmode" ]
+elif [ "${1}" = "txtmode" ]
then
# Generate the grub.elf (txtmode)
- $grubdir/grub-mkstandalone \
- --grub-mkimage=$grubdir/grub-mkimage \
+ "${grubdir}/grub-mkstandalone" \
+ --grub-mkimage="${grubdir}/grub-mkimage" \
-O i386-coreboot \
- -o grub_txtmode.elf \
- -d $grubdir/grub-core/ \
+ -o "grub_txtmode.elf" \
+ -d "${grubdir}/grub-core/" \
--fonts= --themes= --locales= \
- --modules="$grub_modules" \
- --install-modules="$grub_install_modules" \
+ --modules="${grub_modules}" \
+ --install-modules="${grub_install_modules}" \
/boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
/memtest="../../../memtest86+-5.01/memtest" \
$(./grub_memdisk_keymap)
else
- echo "grub-assemble gen.sh: invalid mode '$1'"
+ printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}"
exit 1
fi
printf "\n\n"
diff --git a/resources/utilities/grub-assemble/grub_memdisk_keymap b/resources/utilities/grub-assemble/grub_memdisk_keymap
index df25a0f..0893c4c 100755
--- a/resources/utilities/grub-assemble/grub_memdisk_keymap
+++ b/resources/utilities/grub-assemble/grub_memdisk_keymap
@@ -24,5 +24,5 @@ set -u -e
for keymap in $(ls keymap/original)
do
- printf "/boot/grub/layouts/$keymap.gkb=keymap/$keymap.gkb "
+ printf "/boot/grub/layouts/$keymap.gkb=keymap/${keymap}.gkb "
done