Browse Source

Fix the install script after the shellcheck "fixes"

(cherry picked from commit 6d28d4dfaf0632477321248cdb07b31fcb31ffb2)
Nedyalko Andreev 6 years ago
parent
commit
42676bafb8
1 changed files with 4 additions and 3 deletions
  1. 4 3
      archlinux/PKGBUILD.install

+ 4 - 3
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() {