🔧
This commit is contained in:
10
vendor/laravel/sail/bin/sail
vendored
10
vendor/laravel/sail/bin/sail
vendored
@@ -128,8 +128,9 @@ else
|
||||
fi
|
||||
|
||||
# Source the ".env" file so Laravel's environment variables are available...
|
||||
if [ ! -z "$APP_ENV" ] && [ -f ./.env.$APP_ENV ]; then
|
||||
source ./.env.$APP_ENV;
|
||||
# shellcheck source=/dev/null
|
||||
if [ -n "$APP_ENV" ] && [ -f ./.env."$APP_ENV" ]; then
|
||||
source ./.env."$APP_ENV";
|
||||
elif [ -f ./.env ]; then
|
||||
source ./.env;
|
||||
fi
|
||||
@@ -159,8 +160,7 @@ function sail_is_not_running {
|
||||
}
|
||||
|
||||
# Define Docker Compose command prefix...
|
||||
docker compose &> /dev/null
|
||||
if [ $? == 0 ]; then
|
||||
if docker compose &> /dev/null; then
|
||||
DOCKER_COMPOSE=(docker compose)
|
||||
else
|
||||
DOCKER_COMPOSE=(docker-compose)
|
||||
@@ -560,7 +560,7 @@ elif [ "$1" == "open" ]; then
|
||||
shift 1
|
||||
|
||||
if [ "$EXEC" == "yes" ]; then
|
||||
open $APP_URL
|
||||
open "$APP_URL"
|
||||
|
||||
exit
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user