From 1b234ff597d4eceb5774c81a8b3befc567c20692 Mon Sep 17 00:00:00 2001 From: tpoindex Date: Wed, 11 Sep 2019 23:53:56 -0600 Subject: [PATCH] avoid collisions with common /usr/bin/ commands rename head, tail, zip to lhead, ltail, and lzip to avoid collisions with command unix commands --- src/fun.sh | 6 +++--- test/head_test.sh | 16 ++++++++-------- test/tail_test.sh | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/fun.sh b/src/fun.sh index 5d44542..08f3bc1 100755 --- a/src/fun.sh +++ b/src/fun.sh @@ -8,11 +8,11 @@ take() { command head -n ${1} } -tail() { +ltail() { drop 1 } -head() { +lhead() { take 1 } @@ -316,7 +316,7 @@ ntupr() { ntupx 1- "$@" | last } -zip() { +lzip() { local list=$* cat - | while read x; do y=$(list $list | take 1) diff --git a/test/head_test.sh b/test/head_test.sh index 3ea2a7f..90ea201 100755 --- a/test/head_test.sh +++ b/test/head_test.sh @@ -1,16 +1,16 @@ #! /bin/bash -testHeadFromList() { - assertEquals 1 $(list {1..10} | head) - assertEquals 5 $(list 5 6 7 | head) +testLHeadFromList() { + assertEquals 1 $(list {1..10} | lhead) + assertEquals 5 $(list 5 6 7 | lhead) } -testHeadFromOneElementList() { - assertEquals 1 $(list 1 | head) +testLHeadFromOneElementList() { + assertEquals 1 $(list 1 | lhead) } -testHeadFromEmptyList() { - assertEquals "" "$(list | head)" +testLHeadFromEmptyList() { + assertEquals "" "$(list | lhead)" } -. ./shunit2-init.sh \ No newline at end of file +. ./shunit2-init.sh diff --git a/test/tail_test.sh b/test/tail_test.sh index 57971ad..b2b19f5 100755 --- a/test/tail_test.sh +++ b/test/tail_test.sh @@ -1,15 +1,15 @@ #! /bin/bash -testTailFrom10() { - assertEquals "2 3 4 5 6 7 8 9 10" "$(list {1..10} | tail | unlist)" +testLTailFrom10() { + assertEquals "2 3 4 5 6 7 8 9 10" "$(list {1..10} | ltail | unlist)" } -testTailFromOneElementList() { - assertEquals "" "$(list 1 | tail)" +testLTailFromOneElementList() { + assertEquals "" "$(list 1 | ltail)" } -testTailFromEmptyList() { - assertEquals "" "$(list | tail)" +testLTailFromEmptyList() { + assertEquals "" "$(list | ltail)" } -. ./shunit2-init.sh \ No newline at end of file +. ./shunit2-init.sh