Fix error in laravel_version when artisan is not present

pull/22/head
Brandon Clothier 6 years ago
parent a7b3f310d3
commit 48b264f564
No known key found for this signature in database
GPG Key ID: D71A0436ED3153AD

@ -1118,11 +1118,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>&1 | grep -oe '^Laravel Framework [0-9.]*')"
if [[ -n "${laravel_version}" ]]; then if [[ -n "${laravel_version}" ]]; 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
} }

@ -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() {

Loading…
Cancel
Save