From d684fdf6850c3d4fe7e4d0e0b4d05e69f43f8a26 Mon Sep 17 00:00:00 2001 From: Alex Epstein Date: Thu, 12 Oct 2017 18:32:18 -0400 Subject: [PATCH] Updating to 1.19.2 --- README.md | 2 +- bash-snippets.1 | 39 +---------------------- bash-snippets.1.ronn | 23 ------------- changelog.md | 8 +++++ cheat/cheat | 2 +- cloudup/cloudup | 2 +- crypt/crypt | 2 +- cryptocurrency/cryptocurrency | 2 +- currency/currency | 2 +- {lyrics => deprecated/lyrics}/lyrics | 2 +- {lyrics => deprecated/lyrics}/lyrics.png | Bin extras/Linux/maps/maps | 2 +- geo/geo | 2 +- install.sh | 4 +-- movies/movies | 2 +- movies/tmdb | 2 +- newton/newton | 2 +- qrify/qrify | 2 +- short/short | 1 + siteciphers/siteciphers | 2 +- skeleton | 2 +- stocks/stocks | 2 +- taste/taste | 2 +- tests/lyrics.bats | 39 ----------------------- todo/todo | 2 +- transfer/transfer | 2 +- uninstall.sh | 6 +++- weather/weather | 4 +-- ytview/ytview | 2 +- 29 files changed, 39 insertions(+), 125 deletions(-) rename {lyrics => deprecated/lyrics}/lyrics (99%) rename {lyrics => deprecated/lyrics}/lyrics.png (100%) delete mode 100755 tests/lyrics.bats diff --git a/README.md b/README.md index cbfc576..abbfbf6 100644 --- a/README.md +++ b/README.md @@ -390,7 +390,7 @@ cd Bash-Snippets * Git checkout to the latest stable release ```bash -git checkout v1.19.1 +git checkout v1.19.2 ``` * Run the guided install script with diff --git a/bash-snippets.1 b/bash-snippets.1 index 68afd41..4c60e27 100644 --- a/bash-snippets.1 +++ b/bash-snippets.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BASH\-SNIPPETS" "1" "August 2017" "" "" +.TH "BASH\-SNIPPETS" "1" "October 2017" "ff" "" . .SH "NAME" \fBbash\-snippets\fR \- A collection of small bash scripts for heavy terminal users @@ -280,43 +280,6 @@ Example: geo \-a 8\.8\.8\.8 \-o city,zip,isp . .IP "" 0 . -.SS "Lyrics" -Description: Fetch lyrics for a certain song\. -. -.P -Usage: lyrics [flags] or tool [\-a] [arg] [\-s] [arg] -. -.IP "\(bu" 4 -\-a Artist of the song to fetch lyrics for -. -.IP "\(bu" 4 -\-s Song of the artist to fetch lyrics for -. -.IP "\(bu" 4 -\-f Export the lyrics to file rather than outputting to stdout -. -.IP "\(bu" 4 -\-u Update Bash\-Snippet Tools -. -.IP "\(bu" 4 -\-h Show the help -. -.IP "\(bu" 4 -\-v Get the tool version -. -.IP "" 0 -. -.P -Examples: -. -.IP "\(bu" 4 -lyrics \-a logic \-s run it -. -.IP "\(bu" 4 -lyrics \-a logic \-s run it \-f ~/runItLyrics\.txt -. -.IP "" 0 -. .SS "Movies" Description: Provides relevant information about a certain movie\. . diff --git a/bash-snippets.1.ronn b/bash-snippets.1.ronn index 8704bb9..ed9f83e 100644 --- a/bash-snippets.1.ronn +++ b/bash-snippets.1.ronn @@ -194,29 +194,6 @@ Example: geo -a 8.8.8.8 -o city,zip,isp * -u Updates Bash-Snippets -### Lyrics -Description: Fetch lyrics for a certain song. - -Usage: lyrics [flags] or tool [-a] [arg] [-s] [arg] - - * -a Artist of the song to fetch lyrics for - - * -s Song of the artist to fetch lyrics for - - * -f Export the lyrics to file rather than outputting to stdout - - * -u Update Bash-Snippet Tools - - * -h Show the help - - * -v Get the tool version - - Examples: - - * lyrics -a logic -s run it - - * lyrics -a logic -s run it -f ~/runItLyrics.txt - ### Movies Description: Provides relevant information about a certain movie. diff --git a/changelog.md b/changelog.md index bb4de51..3a81bdd 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,14 @@ # Bash-Snippets Changelog +## Changes +* ytview for macOS can now use mpv +* lyrics tool was removed, api is not available anymore + + + +
+ ## Version 1.19.1
diff --git a/cheat/cheat b/cheat/cheat index 9678fe1..f3e0979 100755 --- a/cheat/cheat +++ b/cheat/cheat @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" ## rest of these variables are search flags search="0" diff --git a/cloudup/cloudup b/cloudup/cloudup index 601080e..0f01ff8 100755 --- a/cloudup/cloudup +++ b/cloudup/cloudup @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" private="0" ## state of private flag all="0" ## state of all flag diff --git a/crypt/crypt b/crypt/crypt index 6d79fd3..f1c49af 100755 --- a/crypt/crypt +++ b/crypt/crypt @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" state="" configuredClient="" diff --git a/cryptocurrency/cryptocurrency b/cryptocurrency/cryptocurrency index 3ad83ac..25e2e4f 100755 --- a/cryptocurrency/cryptocurrency +++ b/cryptocurrency/cryptocurrency @@ -3,7 +3,7 @@ base="" exchangeTo="" -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" ## This function determines which http get tool the system has installed and returns an error if there isnt one diff --git a/currency/currency b/currency/currency index 068fbbb..ce0b0da 100755 --- a/currency/currency +++ b/currency/currency @@ -3,7 +3,7 @@ base="" exchangeTo="" -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" currencyCodes=(AUD BGN BRL CAD CHF CNY CZK DKK EUR GBP HKD HRK HUF IDR ILS INR diff --git a/lyrics/lyrics b/deprecated/lyrics/lyrics similarity index 99% rename from lyrics/lyrics rename to deprecated/lyrics/lyrics index 5e6396e..5f1dc51 100755 --- a/lyrics/lyrics +++ b/deprecated/lyrics/lyrics @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" artist="false" song="false" diff --git a/lyrics/lyrics.png b/deprecated/lyrics/lyrics.png similarity index 100% rename from lyrics/lyrics.png rename to deprecated/lyrics/lyrics.png diff --git a/extras/Linux/maps/maps b/extras/Linux/maps/maps index 98e3e79..a011427 100755 --- a/extras/Linux/maps/maps +++ b/extras/Linux/maps/maps @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" directionsFlag="0" directionsMapFlag="0" diff --git a/geo/geo b/geo/geo index fe1eecd..d236716 100755 --- a/geo/geo +++ b/geo/geo @@ -4,7 +4,7 @@ # Author: Jake Meyer # Github: https://github.com/jakewmeyer -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" ## This function determines which http get tool the system has installed and returns an error if there isnt one diff --git a/install.sh b/install.sh index b843aa5..70c1f34 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" -declare -a tools=(cheat cloudup crypt cryptocurrency currency geo lyrics movies newton qrify short siteciphers stocks taste todo transfer weather ytview) +currentVersion="1.19.2" +declare -a tools=(cheat cloudup crypt cryptocurrency currency geo movies newton qrify short siteciphers stocks taste todo transfer weather ytview) declare -a extraLinuxTools=(maps) declare -a extraDarwinTools usedGithubInstallMethod="0" diff --git a/movies/movies b/movies/movies index d71c65e..4d8e89b 100755 --- a/movies/movies +++ b/movies/movies @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" configuredPython="" detail=false diff --git a/movies/tmdb b/movies/tmdb index d24bf0d..3b61b0f 100755 --- a/movies/tmdb +++ b/movies/tmdb @@ -2,7 +2,7 @@ # Author: Alexander Epstein https://github.com/alexanderepstein # Author: Navan Chauhan https://github.com/N3V0N -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" configuredPython="" APIKEY="b2f8880475c888056b6207067fbaa197" diff --git a/newton/newton b/newton/newton index c67a303..a9202a2 100755 --- a/newton/newton +++ b/newton/newton @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" flagCount="0" declare -a simpleOperations=(simplify factor derive integrate zeroes roots tangent area cos sin tan arccos arcsin arctan abs log) diff --git a/qrify/qrify b/qrify/qrify index 8f49869..65870a0 100755 --- a/qrify/qrify +++ b/qrify/qrify @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Linyos Torovoltos github.com/linyostorovovoltos -currentVersion="1.19.1" +currentVersion="1.19.2" multiline="0" # flag that indicates multiline option diff --git a/short/short b/short/short index 744ded9..2f9ea95 100755 --- a/short/short +++ b/short/short @@ -2,6 +2,7 @@ # Author: Alexander Epstein https://github.com/alexanderepstein currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" configuredPython="" diff --git a/siteciphers/siteciphers b/siteciphers/siteciphers index 2ca83e5..5510c61 100755 --- a/siteciphers/siteciphers +++ b/siteciphers/siteciphers @@ -1,7 +1,7 @@ #!/usr/bin/env bash DELAY=1 configuredClient="" -currentVersion="1.19.1" +currentVersion="1.19.2" checkOpenSSL() { diff --git a/skeleton b/skeleton index 76beda1..d791479 100755 --- a/skeleton +++ b/skeleton @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" ## This function determines which http get tool the system has installed and returns an error if there isnt one diff --git a/stocks/stocks b/stocks/stocks index 2af25c5..45f3b63 100755 --- a/stocks/stocks +++ b/stocks/stocks @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" configuredPython="" diff --git a/taste/taste b/taste/taste index cbe0065..870b07e 100755 --- a/taste/taste +++ b/taste/taste @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" configuredPython="" source ~/.bash_profile 2> /dev/null ## allows grabbing enviornment variable diff --git a/tests/lyrics.bats b/tests/lyrics.bats deleted file mode 100755 index b92314c..0000000 --- a/tests/lyrics.bats +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/env bats - -@test "Testing lyrics tool" { - echo lyrics -} - -@test "Check for latest version of bash-snippets on update" { - if [[ "$(uname)" == "Linux" ]];then - run lyrics update - [ "$status" -eq 0 ] - [ "$output" = "Bash-Snippets is already the latest version" ] -fi -} - -@test "The -h option should print usage" { - run lyrics -h - [ "$status" -eq 0 ] - [ "${lines[0]}" = "Lyrics" ] -} - -@test "No arguments prints usage instructions" { - run lyrics - [ "$status" -eq 0 ] - [ "${lines[0]}" = "Lyrics" ] -} - -@test "Getting some lyrics" { - run lyrics -a logic -s run it - [ "$status" -eq 0 ] - [ "${lines[0]}" = "Me and my team gotta intervene" ] -} - -@test "Getting some lyrics to file" { - rm -f ~/templyrics.txt - run lyrics -a logic -s run it -f ~/templyrics.txt - [ "$status" -eq 0 ] - [ "$(cat $HOME/templyrics.txt | grep -Eo "Me and my team gotta intervene")" = "Me and my team gotta intervene" ] - rm -f ~/templyrics.txt -} diff --git a/todo/todo b/todo/todo index b3f15b4..b4a0316 100755 --- a/todo/todo +++ b/todo/todo @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein flag="" -currentVersion="1.19.1" +currentVersion="1.19.2" configuredClient="" ## This function determines which http get tool the system has installed and returns an error if there isnt one diff --git a/transfer/transfer b/transfer/transfer index 2215400..9748cda 100755 --- a/transfer/transfer +++ b/transfer/transfer @@ -3,7 +3,7 @@ configuredDownloadClient="" configuredUploadClient="" configuredClient="" -currentVersion="1.19.1" +currentVersion="1.19.2" down="false" ## This function determines which http get tool the system has installed and returns an error if there isnt one diff --git a/uninstall.sh b/uninstall.sh index 2e45a0d..46c3d7a 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -declare -a tools=(cheat cloudup crypt cryptocurrency currency geo lyrics movies newton qrify short siteciphers stocks taste todo transfer weather ytview) +declare -a tools=(cheat cloudup crypt cryptocurrency currency geo movies newton qrify short siteciphers stocks taste todo transfer weather ytview) all="1" askUninstall() @@ -47,3 +47,7 @@ fi if [[ $all == "1" ]]; then removeManpage || exit 1 fi + +if -f /usr/local/bin/lyrics;then + rm -f /usr/local/bin/lyrics # Tool was deprecated so it should be removed if installed +fi diff --git a/weather/weather b/weather/weather index 2f2b028..2828ae4 100755 --- a/weather/weather +++ b/weather/weather @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Alexander Epstein https://github.com/alexanderepstein -currentVersion="1.19.1" #This version variable should not have a v but should contain all other characters ex Github release tag is v1.2.4 currentVersion is 1.2.4 +currentVersion="1.19.2" #This version variable should not have a v but should contain all other characters ex Github release tag is v1.2.4 currentVersion is 1.2.4 LANG="${LANG:-en}" locale=$(echo $LANG | cut -c1-2) configuredClient="" @@ -40,7 +40,7 @@ getIPWeather() if [[ $country == "US" ]]; then ## if were in the us id rather not use longitude and latitude so the output is nicer city=$(httpGet ipinfo.io/city) > /dev/null region=$(httpGet ipinfo.io/region) > /dev/null - region=$(echo "$region" | tr -dc '[:upper:]') + region=$(echo "$region" | cut -c "1-2" | tr "[:lower:]" "[:upper:]") httpGet $locale.wttr.in/$city,$region$1 else ## otherwise we are going to use longitude and latitude location=$(httpGet ipinfo.io/loc) > /dev/null diff --git a/ytview/ytview b/ytview/ytview index 848ad01..ca1341e 100755 --- a/ytview/ytview +++ b/ytview/ytview @@ -6,7 +6,7 @@ if [[ -d $HOME/.cache/ytview ]]; then rm -rf $HOME/.cache/ytview/; fi player="" configuredClient="" -currentVersion="1.19.1" +currentVersion="1.19.2" flag="" ## This function determines which http get tool the system has installed and returns an error if there isnt one