Skip to content

Commit

Permalink
👌 IMPROVE: log messages for presets
Browse files Browse the repository at this point in the history
  • Loading branch information
apolopena committed Mar 5, 2022
1 parent ca82c90 commit bd80c20
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .gp/bash/init-optional-scaffolding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ rrd_ver=$(eval "$parse" react-router-dom version)
laravel_major_ver=$(bash .gp/bash/helpers.sh laravel_major_version)
laravel_ui_ver=$(bash .gp/bash/helpers.sh laravel_ui_version)
init_phpmyadmin=".gp/bash/init-phpmyadmin.sh"
react_examp_warn1='WARNING: React examples require Laravel version >= 8.*'
react_examp_warn1='WARNING: React preset examples require Laravel version >= 8.*'
react_examp_warn2="WARNING: Ignoring the preset example requested:"

# BEGIN: configure preset example
show_preset_example_msg () {
log "EXAMPLE directive query parameter found"
log " --> Some directives in starter.ini will be superceded"
log "Creating the example project"
log "Creating the preset example project"
log " --> $example_title"
}
# Any value set for EXAMPLE will build an example project thus superceding some directives in starter.ini
Expand Down Expand Up @@ -102,8 +102,8 @@ if [[ -n $EXAMPLE ]]; then
10)
example_title="Vue Example with phpMyAdmin and extras - Material Dashboard"
if [[ $laravel_major_ver -ge 9 ]]; then
log -e "WARNING: Vue example uses Material Dashboard which does not support Laravel version > 8.*"
log -e "WARNING: Ignoring the example requested: $example_title"
log -e "WARNING: Vue preset example uses Material Dashboard which does not support Laravel version > 8.*"
log -e "WARNING: Ignoring the preset example requested: $example_title"
else
init_vue_example=".gp/bash/examples/init-vue-example.sh"
install_react=0
Expand Down Expand Up @@ -146,8 +146,8 @@ if [[ -n $EXAMPLE ]]; then
;;
esac
else
log "WARNING: EXAMPLE$EXAMPLE requested but Laravel scaffolding seems to already be in version control"
log "Skipping creation of the example project $EXAMPLE"
log "WARNING: preset EXAMPLE $EXAMPLE requested but Laravel scaffolding seems to already be in version control"
log "Skipping creation of the preset example project $EXAMPLE"
fi # end check Laravel scaffolding is already in version control
fi # end check EXAMPLE query parameter
# END: configure preset example
Expand Down
2 changes: 1 addition & 1 deletion starter.ini
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ install=0
# Laravel always gives you the latest or most stable Minor and Patch versions which are non-breaking.
# The version value is for initial setup only and is ignored once the Laravel scaffolding have been pushed
# to your repository.
version=9.*
version=8.*
# allow_mixed_web
# Valid values are 0 (off) or 1 (on). Only turn this off if you know what you are doing.
# Default value is 1
Expand Down

0 comments on commit bd80c20

Please sign in to comment.