From 8a99865be5b3377e73d03fb61f5963c0b17b6262 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Mon, 21 Jan 2019 20:02:25 +0900 Subject: [PATCH] refactor: consume empty lines in fishfile --- fisher.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fisher.fish b/fisher.fish index b0d3c11..67d9bb6 100644 --- a/fisher.fish +++ b/fisher.fish @@ -246,14 +246,14 @@ function _fisher_parse -a mode cmd BEGIN { for (n = split(ARGSTR, a, " "); i++ < n;) pkgs[getkey(a[i])] = a[i] } - { k = getkey($1) } + !NF { next } { k = getkey($1) } MODE == "-R" && !(k in pkgs) && $0 = $1 MODE == "-W" && (/^#/ || k in pkgs || CMD != "rm") { print pkgs[k] (sub($1, "") ? $0 : "") } MODE == "-W" || CMD == "rm" { delete pkgs[k] } END { for (k in pkgs) { if (CMD != "rm" || MODE == "-W") print pkgs[k] - else print "package not in fishfile: \""k"\"" > "/dev/stderr" + else print "fisher: cannot remove \""k"\" -- package is not in fishfile" > "/dev/stderr" } } function getkey(s, a) {