Skip to content

Commit

Permalink
Merge pull request #79 from muhammetsait/fix-quiet-flag-issue-with-la…
Browse files Browse the repository at this point in the history
…ravel-installer

fix quiet flag issue with laravel installer
  • Loading branch information
mattstauffer authored Nov 13, 2019
2 parents 869a418 + 115eee1 commit fff24de
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions lambo
Original file line number Diff line number Diff line change
Expand Up @@ -364,17 +364,9 @@ ${green}Running the Laravel installer...${reset}
"
# @todo figure out why this is necessary--why does "$QUIET_FLAG" throw a fit with laravel new when it's empty?
if [[ "$DEVELOP" = true ]]; then
if [[ "$QUIET" = true ]]; then
laravel new "$PROJECTNAME" --quiet --dev
else
laravel new "$PROJECTNAME" --dev
fi
laravel new "$PROJECTNAME" $QUIET_FLAG --dev
else
if [[ "$QUIET" = true ]]; then
laravel new "$PROJECTNAME" --quiet
else
laravel new "$PROJECTNAME"
fi
laravel new "$PROJECTNAME" $QUIET_FLAG
fi

cd "$PROJECTNAME" || exit
Expand All @@ -389,7 +381,7 @@ if [[ "$FRONTEND" != "" ]]; then
echo "
${green}Installing ${orange}laravel/ui${green}...${reset}
"
composer require laravel/ui "$QUIET_FLAG"
composer require laravel/ui $QUIET_FLAG

if [[ "$FRONTEND" = "bootstrap" ]]; then
php artisan ui bootstrap
Expand All @@ -408,7 +400,7 @@ if [[ "$AUTH" = true ]]; then
echo "
${green}Installing ${orange}laravel/ui${green}...${reset}
"
composer require laravel/ui "$QUIET_FLAG"
composer require laravel/ui $QUIET_FLAG
fi

php artisan ui:auth
Expand All @@ -420,9 +412,9 @@ ${green}Installing NPM dependencies...${reset}
"
# check if yarn is executable, otherwise use npm
if hash yarn 2>/dev/null; then
yarn "$SILENT_FLAG"
yarn $SILENT_FLAG
else
npm install "$SILENT_FLAG"
npm install $SILENT_FLAG
fi
fi

Expand All @@ -448,7 +440,7 @@ php artisan key:generate --ansi

git init
git add .
git commit -m "$MESSAGE" "$QUIET_FLAG"
git commit -m "$MESSAGE" $QUIET_FLAG

if [[ "$LINK" = true ]]; then
valet link "$PROJECTNAME"
Expand Down

0 comments on commit fff24de

Please sign in to comment.