diff --git a/.circleci/config-original.yml b/.circleci/config-original.yml deleted file mode 100644 index 8fbabec..0000000 --- a/.circleci/config-original.yml +++ /dev/null @@ -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=<> - - -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] - diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ae9fdf..8fbabec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,162 +1,79 @@ -version: 2 -jobs: - build: - docker: - - image: alpine:latest - 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 - - checkout - - run: - name: Build - command: ./build.sh --minify=all - test-snapshots: - docker: - - image: alpine:latest - 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 - - checkout - - run: - name: Build - command: ./build.sh --minify=all - - run: - name: 'Test: Snapshots' - command: test/run.sh snapshot-test - test-consistency: - docker: - - image: alpine:latest - 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 - - checkout - - run: - name: Build - command: ./build.sh --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 +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=<> + + +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] -# 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=<> -# -# -# 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] \ No newline at end of file diff --git a/src/batgrep.sh b/src/batgrep.sh index 2b59322..641c99e 100644 --- a/src/batgrep.sh +++ b/src/batgrep.sh @@ -102,6 +102,7 @@ do_print() { "${LAST_LR[@]}" \ "${LAST_LH[@]}" \ --style="header,numbers" \ + --paging=never \ "$LAST_FILE" # Print the separator.