From 843ef4a05991a0e3274724b87cfa5cbeb8854020 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Tue, 28 Mar 2017 10:10:03 -0700 Subject: [PATCH 1/2] Changed .env replacements to use perl instead of sed --- lambo | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lambo b/lambo index 8ce31063..de1a034c 100755 --- a/lambo +++ b/lambo @@ -139,22 +139,20 @@ fi # Update .env to point to this database with `root` username and blank pw, # like Mac MySQL defaults, and appropriate domain PROJECTURL="http://$PROJECTNAME.$TLD" -sedCommands=( - "/DB_DATABASE/s/homestead/$PROJECTNAME/" - '/DB_USERNAME/s/homestead/root/' - '/DB_PASSWORD/s/secret//' - "/APP_URL/s/localhost/$PROJECTNAME\.$TLD/" +perlCommands=( + "s/(DB_DATABASE=)(.*)/\1$PROJECTNAME/g" + 's/(DB_USERNAME=)(.*)/\1root/g' + 's/(DB_PASSWORD=)(.*)/\1/g' + "s/(APP_URL=)(.*)/\1$PROJECTNAME\.$TLD/g" ) -if [[ "$(uname)" == "Darwin" ]]; then - for sedCommand in "${sedCommands[@]}"; do - sed -i '' "$sedCommand" .env +for perlCommand in "${perlCommands[@]}"; do + perl -pi -e "$perlCommand" ".env" done + +if [[ "$(uname)" == "Darwin" ]]; then open "$PROJECTURL" elif [[ "$(expr substr $(uname -s) 1 5)" == "Linux" ]]; then - for sedCommand in "${sedCommands[@]}"; do - sed -i "$sedCommand" .env - done xdg-open "$PROJECTURL" fi From 4d51e50f16257709691a6ec6ad34eb3db28461ba Mon Sep 17 00:00:00 2001 From: Matt Stauffer Date: Mon, 20 Nov 2017 08:21:10 -0500 Subject: [PATCH 2/2] Add http:// to Perl APP_URL replacer --- lambo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambo b/lambo index 58fcaf98..760f75e6 100755 --- a/lambo +++ b/lambo @@ -316,7 +316,7 @@ perlCommands=( "s/(DB_DATABASE=)(.*)/\1$PROJECTNAME/g" 's/(DB_USERNAME=)(.*)/\1root/g' 's/(DB_PASSWORD=)(.*)/\1/g' - "s/(APP_URL=)(.*)/\1$PROJECTNAME\.$TLD/g" + "s/(APP_URL=)(.*)/\1http:\/\/$PROJECTNAME.$TLD/g" ) if [[ "$LINK" = true ]]; then