Skip to content

Commit

Permalink
Merge pull request #94 from rcaloras/2.1.3-dev
Browse files Browse the repository at this point in the history
2.1.3 dev
  • Loading branch information
rcaloras authored Dec 28, 2020
2 parents 6318a37 + b07f4b7 commit f507d7e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bashhub/version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import platform

__version__ = '2.1.2'
__version__ = '2.1.3'

version_str = 'Bashhub {0} (python {1})'.format(__version__, platform.python_version())
6 changes: 3 additions & 3 deletions install-bashhub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi

python_command='
import sys
if (3, 5, 0) < sys.version_info < (3,8):
if (3, 5, 0) < sys.version_info < (4,0):
sys.exit(0)
elif (2, 7, 0) < sys.version_info < (3,0):
sys.exit(0)
Expand All @@ -52,7 +52,7 @@ fish_config="${XDG_CONFIG_HOME:-~/.config}/fish/config.fish"

# Optional parameter to specify a github branch
# to pull from.
github_branch=${1:-'2.1.2'}
github_branch=${1:-'2.1.3'}

install_bashhub() {
check_dependencies
Expand All @@ -62,7 +62,7 @@ install_bashhub() {

get_and_check_python_version() {
# Prefer Python 3 versions over python 2
python_version_array=( "python3.7" "python3.6" "python3.5" "python3" "python" "python2.7" "python27" "python2")
python_version_array=( "python3.8" "python3.7" "python3.6" "python3.5" "python3" "python" "python2.7" "python27" "python2")

for python_version in "${python_version_array[@]}"; do
if type "$python_version" &> /dev/null; then
Expand Down
2 changes: 2 additions & 0 deletions tests/shell/install-bashhub.bats
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ setup() {

@test "get_and_check_python_version should find python3 first" {
# Mock up some fake responses here.
python3.8() { return 1; }
python3.7() { return 1; }
python3.6() { return 1; }
python3.5() { return 1; }
Expand All @@ -52,6 +53,7 @@ setup() {
# Mock up some fake responses here.

python3() { return 1; }
python3.8() { return 1; }
python3.7() { return 1; }
python3.6() { return 1; }
python3.5() { return 1; }
Expand Down

0 comments on commit f507d7e

Please sign in to comment.