Fixed batgrep using the pager for bat.

This commit is contained in:
Ethan P 2019-06-19 17:33:06 -07:00
parent ade37fd4ee
commit 2633149c04
No known key found for this signature in database
GPG Key ID: 1F8DF8091CD46FBC
3 changed files with 79 additions and 240 deletions

View File

@ -1,79 +0,0 @@
version: 2.1
executors:
linux_alpine:
docker:
- image: alpine:latest
commands:
setup:
description: "Set up the environment needed to test and run the scripts."
steps:
- run:
name: "APK: Add repository."
command: printf "\n%s\n" "http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
- run:
name: "APK: Update cache."
command: apk update
- run:
name: "Setup: Install build packages."
command: apk add bash python2
- run:
name: "Setup: Install runtime packages."
command: apk add bat ripgrep
build:
description: "Build the self-contained scripts."
parameters:
minify:
type: string
default: "lib"
steps:
- run:
name: "Build"
command: ./build.sh --minify=<<parameters.minify>>
jobs:
build:
executor: linux_alpine
steps:
- setup
- checkout
- build:
minify: "all"
test-snapshots:
executor: linux_alpine
steps:
- setup
- checkout
- build:
minify: "all"
- run:
name: "Test: Snapshots"
command: test/run.sh snapshot-test
test-consistency:
executor: linux_alpine
steps:
- setup
- checkout
- build:
minify: "all"
- run:
name: "Test: Consistency"
command: test/run.sh consistency-test
workflows:
version: 2
default:
jobs:
- build
- test-snapshots:
requires: [build]
- test-consistency:
requires: [build]

View File

@ -1,162 +1,79 @@
version: 2 version: 2.1
jobs:
build: executors:
docker: linux_alpine:
- image: alpine:latest docker:
steps: - image: alpine:latest
- run:
name: 'APK: Add repository.' commands:
command: printf "\n%s\n" "http://nl.alpinelinux.org/alpine/edge/testing" >> setup:
/etc/apk/repositories description: "Set up the environment needed to test and run the scripts."
- run: steps:
name: 'APK: Update cache.' - run:
command: apk update name: "APK: Add repository."
- run: command: printf "\n%s\n" "http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
name: 'Setup: Install build packages.' - run:
command: apk add bash python2 name: "APK: Update cache."
- run: command: apk update
name: 'Setup: Install runtime packages.' - run:
command: apk add bat ripgrep name: "Setup: Install build packages."
- checkout command: apk add bash python2
- run: - run:
name: Build name: "Setup: Install runtime packages."
command: ./build.sh --minify=all command: apk add bat ripgrep
test-snapshots:
docker: build:
- image: alpine:latest description: "Build the self-contained scripts."
steps: parameters:
- run: minify:
name: 'APK: Add repository.' type: string
command: printf "\n%s\n" "http://nl.alpinelinux.org/alpine/edge/testing" >> default: "lib"
/etc/apk/repositories steps:
- run: - run:
name: 'APK: Update cache.' name: "Build"
command: apk update command: ./build.sh --minify=<<parameters.minify>>
- run:
name: 'Setup: Install build packages.'
command: apk add bash python2 jobs:
- run:
name: 'Setup: Install runtime packages.' build:
command: apk add bat ripgrep executor: linux_alpine
- checkout steps:
- run: - setup
name: Build - checkout
command: ./build.sh --minify=all - build:
- run: minify: "all"
name: 'Test: Snapshots'
command: test/run.sh snapshot-test test-snapshots:
test-consistency: executor: linux_alpine
docker: steps:
- image: alpine:latest - setup
steps: - checkout
- run: - build:
name: 'APK: Add repository.' minify: "all"
command: printf "\n%s\n" "http://nl.alpinelinux.org/alpine/edge/testing" >> - run:
/etc/apk/repositories name: "Test: Snapshots"
- run: command: test/run.sh snapshot-test
name: 'APK: Update cache.'
command: apk update test-consistency:
- run: executor: linux_alpine
name: 'Setup: Install build packages.' steps:
command: apk add bash python2 - setup
- run: - checkout
name: 'Setup: Install runtime packages.' - build:
command: apk add bat ripgrep minify: "all"
- checkout - run:
- run: name: "Test: Consistency"
name: Build command: test/run.sh consistency-test
command: ./build.sh --minify=all
- run:
name: 'Test: Consistency' workflows:
command: test/run.sh consistency-test version: 2
workflows: default:
version: 2 jobs:
default: - build
jobs: - test-snapshots:
- build requires: [build]
- test-snapshots: - test-consistency:
requires: requires: [build]
- build
- test-consistency:
requires:
- build
# Original config.yml file:
# version: 2.1
#
# executors:
# linux_alpine:
# docker:
# - image: alpine:latest
#
# commands:
# setup:
# description: \"Set up the environment needed to test and run the scripts.\"
# steps:
# - run:
# name: \"APK: Add repository.\"
# command: printf \"\\n%s\\n\" \"http://nl.alpinelinux.org/alpine/edge/testing\" >> /etc/apk/repositories
# - run:
# name: \"APK: Update cache.\"
# command: apk update
# - run:
# name: \"Setup: Install build packages.\"
# command: apk add bash python2
# - run:
# name: \"Setup: Install runtime packages.\"
# command: apk add bat ripgrep
#
# build:
# description: \"Build the self-contained scripts.\"
# parameters:
# minify:
# type: string
# default: \"lib\"
# steps:
# - run:
# name: \"Build\"
# command: ./build.sh --minify=<<parameters.minify>>
#
#
# jobs:
#
# build:
# executor: linux_alpine
# steps:
# - setup
# - checkout
# - build:
# minify: \"all\"
#
# test-snapshots:
# executor: linux_alpine
# steps:
# - setup
# - checkout
# - build:
# minify: \"all\"
# - run:
# name: \"Test: Snapshots\"
# command: test/run.sh snapshot-test
#
# test-consistency:
# executor: linux_alpine
# steps:
# - setup
# - checkout
# - build:
# minify: \"all\"
# - run:
# name: \"Test: Consistency\"
# command: test/run.sh consistency-test
#
#
# workflows:
# version: 2
# default:
# jobs:
# - build
# - test-snapshots:
# requires: [build]
# - test-consistency:
# requires: [build]

View File

@ -102,6 +102,7 @@ do_print() {
"${LAST_LR[@]}" \ "${LAST_LR[@]}" \
"${LAST_LH[@]}" \ "${LAST_LH[@]}" \
--style="header,numbers" \ --style="header,numbers" \
--paging=never \
"$LAST_FILE" "$LAST_FILE"
# Print the separator. # Print the separator.