diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-14 14:36:03 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-14 15:45:21 +0100 |
| commit | c6801f502c4e58e2685ea2961a1b310692428bf3 (patch) | |
| tree | 2d43a09162e9018c396fbef8d29fc145c44b1a43 /tools/meson-hwdb-update.sh | |
| parent | 966c04cf012f48686cf5359067a7b26c080f44ea (diff) | |
| download | systemd-c6801f502c4e58e2685ea2961a1b310692428bf3.tar.gz | |
meson-hwdb-update: fix undefined variable access
I added the test if an optional parameter is not empty, but that doesn't work
with -u. Provide an empty "fallback" value to fix the issue.
Also group the update steps so that it's easier to see what is going on.
Diffstat (limited to 'tools/meson-hwdb-update.sh')
| -rwxr-xr-x | tools/meson-hwdb-update.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/meson-hwdb-update.sh b/tools/meson-hwdb-update.sh index 33d603e16a..e9a78c647f 100755 --- a/tools/meson-hwdb-update.sh +++ b/tools/meson-hwdb-update.sh @@ -2,7 +2,7 @@ cd "$1" -if [ "$2" != "-n" ]; then +if [ "${2:-}" != "-n" ]; then curl -L -o usb.ids 'http://www.linux-usb.org/usb.ids' curl -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' curl -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt' @@ -11,7 +11,9 @@ if [ "$2" != "-n" ]; then curl -L -o pnp_id_registry.html 'http://www.uefi.org/uefi-pnp-export' curl -L -o acpi_id_registry.html 'http://www.uefi.org/uefi-acpi-export' fi -./ids_parser.py + ./acpi-update.py >20-acpi-vendor.hwdb.base patch -p0 -o- 20-acpi-vendor.hwdb.base <20-acpi-vendor.hwdb.patch >20-acpi-vendor.hwdb ! diff -u 20-acpi-vendor.hwdb.base 20-acpi-vendor.hwdb >20-acpi-vendor.hwdb.patch + +./ids_parser.py |