mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-22 07:11:58 +00:00
Merge pull request #912 from brandon14/laravel_pormpt_fix
[Bugfix] Fix error in laravel_version when artisan is not present
This commit is contained in:
commit
571a859413
2 changed files with 9 additions and 9 deletions
|
@ -1130,11 +1130,10 @@ prompt_vpn_ip() {
|
|||
################################################################
|
||||
# Segment to display laravel version
|
||||
prompt_laravel_version() {
|
||||
local laravel_version="$(php artisan --version 2>/dev/null)"
|
||||
if [[ -n "${laravel_version}" ]]; then
|
||||
# Remove unrelevant infos
|
||||
laravel_version="${laravel_version//Laravel Framework version /}"
|
||||
|
||||
local laravel_version="$(php artisan --version 2> /dev/null)"
|
||||
if [[ -n "${laravel_version}" && "${laravel_version}" =~ "Laravel Framework" ]]; then
|
||||
# Strip out everything but the version
|
||||
laravel_version="${laravel_version//Laravel Framework /}"
|
||||
"$1_prompt_segment" "$0" "$2" "maroon" "white" "${laravel_version}" 'LARAVEL_ICON'
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -14,16 +14,17 @@ function setUp() {
|
|||
function mockLaravelVersion() {
|
||||
case "$1" in
|
||||
"artisan")
|
||||
echo "Laravel Framework version 5.4.23"
|
||||
# artisan --version follows the format Laravel Framework <version>
|
||||
echo "Laravel Framework 5.4.23"
|
||||
;;
|
||||
default)
|
||||
esac
|
||||
}
|
||||
|
||||
function mockNoLaravelVersion() {
|
||||
# This should output some error
|
||||
>&2 echo "Artisan not available"
|
||||
return 1
|
||||
# When php can't find a file it will output a message
|
||||
echo "Could not open input file: artisan"
|
||||
return 0
|
||||
}
|
||||
|
||||
function testLaravelVersionSegment() {
|
||||
|
|
Loading…
Reference in a new issue