From 42676bafb836c241f786db764448b7563ef560e8 Mon Sep 17 00:00:00 2001 From: Nedyalko Andreev Date: Mon, 2 Oct 2017 01:22:40 +0300 Subject: [PATCH] Fix the install script after the shellcheck "fixes" (cherry picked from commit 6d28d4dfaf0632477321248cdb07b31fcb31ffb2) --- archlinux/PKGBUILD.install | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 4e61761..3a57314 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -142,7 +142,8 @@ EOF base=$(echo "$current_locale" | cut -f 1 -d .) charmap=$(echo "$current_locale.UTF-8" | cut -f 2 -d .) [ -n "$charmap" ] && charmap="-f $charmap" - localedef -i "$base" "$charmap" "$current_locale" + # shellcheck disable=SC2086 + localedef -i "$base" $charmap "$current_locale" fi } @@ -180,7 +181,7 @@ unmask() { preset_units() { local represet= - while read -r action unit_name < "$1" + while read -r action unit_name do if [ "$action" = "#" ] && [ "$unit_name" = "Units below this line will be re-preset on package upgrade" ] then @@ -210,7 +211,7 @@ preset_units() { systemctl --no-reload preset "$unit_name" >/dev/null 2>&1 || : fi fi - done + done < "$1" } restore_units() {