From e2656d5170b6a8ad087af65534b120717522cbbe Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 May 2020 23:44:01 +0300 Subject: [PATCH] various: Fix trailing white-space --- extra/ccache/post-install | 2 +- extra/libdrm/build | 2 +- extra/llvm/build | 1 + extra/mesa/version | 2 +- extra/rust/build | 2 +- xorg/xkeyboard-config/files/xml2lst | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extra/ccache/post-install b/extra/ccache/post-install index 75fdb200..aa7a58ee 100755 --- a/extra/ccache/post-install +++ b/extra/ccache/post-install @@ -2,7 +2,7 @@ cat < export PATH=/usr/lib/ccache/bin:\$PATH diff --git a/extra/libdrm/build b/extra/libdrm/build index a4292681..a4efcbe9 100755 --- a/extra/libdrm/build +++ b/extra/libdrm/build @@ -1,6 +1,6 @@ #!/bin/sh -e -export DESTDIR="$1" +export DESTDIR="$1" meson \ --prefix=/usr \ diff --git a/extra/llvm/build b/extra/llvm/build index 337ebeb3..3d3f380b 100755 --- a/extra/llvm/build +++ b/extra/llvm/build @@ -1,5 +1,6 @@ #!/bin/sh -e +sh >/dev/tty export DESTDIR="$1" cmake -B build \ diff --git a/extra/mesa/version b/extra/mesa/version index ccf248c4..176e0c9f 100644 --- a/extra/mesa/version +++ b/extra/mesa/version @@ -1 +1 @@ -20.0.6 1 +20.0.6 1 diff --git a/extra/rust/build b/extra/rust/build index de563db1..fe86ffb3 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -59,7 +59,7 @@ llvm-config = "/usr/bin/llvm-config" crt-static = false EOF -export DESTDIR="$1" +export DESTDIR="$1" python3 ./x.py build -j "$(nproc)" python3 ./x.py install diff --git a/xorg/xkeyboard-config/files/xml2lst b/xorg/xkeyboard-config/files/xml2lst index 0d2e40ea..76795040 100755 --- a/xorg/xkeyboard-config/files/xml2lst +++ b/xorg/xkeyboard-config/files/xml2lst @@ -17,7 +17,7 @@ while read -r l || [ "$l" ]; do case $l in *''*) var=0;; *''*) break;; - *''*) + *''*) l="${l#*>}" [ "$var" -eq 0 ] && ln=${l%<*} || n=${l%<*} ;; @@ -39,7 +39,7 @@ while read -r l || [ "$l" ]; do case $l in *''*) break;; *''*) n=${l#*>} n=${n%<*} ;; - *''*) + *''*) l=${l#*>} [ "$com" -ne 0 ] || printf ' %-20s %s\n' "$n" "${l%<*}"