summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2021-04-13 16:27:04 -0400
committerGitHub <noreply@github.com>2021-04-13 16:27:04 -0400
commit8151bb46b32d2d585a645dc710d2de6c9ed2d3de (patch)
tree8871eef8ccf8549440d69262e59aa6916ab9aa02
parent11e2858f1afd426397abee23b0ddfbb23740677a (diff)
parent61798244e552f5663fb7546644ba26c11410d3d2 (diff)
downloadbfs-8151bb46b32d2d585a645dc710d2de6c9ed2d3de.tar.xz
Merge pull request #69 from markus-oberhumer/fix-launch-pager-v2
-rw-r--r--.github/workflows/freebsd.yml2
-rw-r--r--parse.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 945be19..c05ef7a 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -4,6 +4,8 @@ on: [push, pull_request]
jobs:
build:
+ if: github.event.pull_request.head.repo.full_name == github.repository
+
runs-on: ubuntu-latest
steps:
diff --git a/parse.c b/parse.c
index a315243..4d4702c 100644
--- a/parse.c
+++ b/parse.c
@@ -2494,7 +2494,7 @@ static struct expr *parse_xdev(struct parser_state *state, int arg1, int arg2) {
*/
static CFILE *launch_pager(pid_t *pid, CFILE *cout) {
char *pager = getenv("PAGER");
- if (!pager) {
+ if (!pager || !pager[0]) {
pager = "more";
}