Fix serious logic error in platform choice code

This commit is contained in:
pepa65 2017-02-07 09:01:32 +07:00
parent 2bb8425460
commit 1dffa6815d
1 changed files with 5 additions and 4 deletions

9
tldr
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set +x -o pipefail set -o pipefail
[[ $- == *i* ]] && echo "Don't source this script!" && return 1 [[ $- == *i* ]] && echo "Don't source this script!" && return 1
# Bash tldr client # Bash tldr client
# forked from Ray Lee, http://github.com/raylee/tldr # forked from Ray Lee, http://github.com/raylee/tldr
@ -187,7 +187,7 @@ Get_tldr(){ # $1: page
[[ $desc ]] || return # just not found [[ $desc ]] || return # just not found
err=0 local err=0
[[ $platform ]] && { # platform given on commandline [[ $platform ]] && { # platform given on commandline
[[ $desc =~ \"$platform\" ]] && PAGE=$platform/$1.md || { [[ $desc =~ \"$platform\" ]] && PAGE=$platform/$1.md || {
notfound=$I$platform$XI notfound=$I$platform$XI
@ -198,8 +198,9 @@ Get_tldr(){ # $1: page
notfound+=${I}common$XI notfound+=${I}common$XI
} }
# if no page found yet, try the system platform # if no page found yet, try the system platform
[[ $PAGE ]] || [[ $platform = $PLATFORM ]] || \ [[ $PAGE ]] || [[ $platform = $PLATFORM ]] || {
[[ $desc =~ \"$PLATFORM\" ]] && PAGE=$PLATFORM/$1.md || { [[ $desc =~ \"$PLATFORM\" ]] && PAGE=$PLATFORM/$1.md
} || {
notfound+=" or $I$PLATFORM$XI" notfound+=" or $I$PLATFORM$XI"
err=1 err=1
} }