linux/powerlevel10k
0
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-09-19 03:51:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #912 from brandon14/laravel_pormpt_fix

Browse source 
[Bugfix] Fix error in laravel_version when artisan is not present
This commit is contained in:
Ben Hilburn 2018-07-23 14:34:00 -04:00 committed by GitHub
commit 571a859413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
powerlevel9k.zsh-theme
View file

@ -1130,11 +1130,10 @@ prompt_vpn_ip() {
################################################################ ################################################################
# Segment to display laravel version # Segment to display laravel version
prompt_laravel_version() { prompt_laravel_version() {
local laravel_version="$(php artisan --version 2>/dev/null)" local laravel_version="$(php artisan --version 2> /dev/null)"
if [[ -n "${laravel_version}" ]]; then if [[ -n "${laravel_version}" && "${laravel_version}" =~ "Laravel Framework" ]]; then
# Remove unrelevant infos # Strip out everything but the version
laravel_version="${laravel_version//Laravel Framework version /}" laravel_version="${laravel_version//Laravel Framework /}"
"$1_prompt_segment" "$0" "$2" "maroon" "white" "${laravel_version}" 'LARAVEL_ICON' "$1_prompt_segment" "$0" "$2" "maroon" "white" "${laravel_version}" 'LARAVEL_ICON'
fi fi
} }

9
test/segments/laravel_version.spec
View file

@ -14,16 +14,17 @@ function setUp() {
function mockLaravelVersion() { function mockLaravelVersion() {
case "$1" in case "$1" in
"artisan") "artisan")
echo "Laravel Framework version 5.4.23" # artisan --version follows the format Laravel Framework <version>
echo "Laravel Framework 5.4.23"
;; ;;
default) default)
esac esac
} }
function mockNoLaravelVersion() { function mockNoLaravelVersion() {
# This should output some error # When php can't find a file it will output a message
>&2 echo "Artisan not available" echo "Could not open input file: artisan"
return 1 return 0
} }
function testLaravelVersionSegment() { function testLaravelVersionSegment() {