🐛 FIX: pass dev qa for #109 allow_mixed_web directive in starter.ini

Author: apolopena

.gp/bash/directives/allow-mixed-web.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: MIT
+# Copyright © 2021 Apolo Pena
+#
+# allow-mixed-web.sh
+# Description:
+# Injects routes/web.php with a snippet that allows mixed web content
+#
+# Notes:
+# Call this script from init-complete.sh to ensure the snippet will not be overwritten.
+
+. .gp/bash/workspace-init-logger.sh
+. .gp/bash/spinner.sh
+laravel_web=routes/web.php
+laravel_web_snippet=.gp/snippets/laravel/routes/web/allow-mixed-web.snippet
+msg="Injecting $laravel_web file"
+if [[ -e $laravel_web ]]; then
+  [[ ! -e $laravel_web_snippet ]] && fail=1 && e_msg="Missing injection file $laravel_web_snippet"
+  if ! grep -q "Injected from $laravel_web_snippet" "$laravel_web"; then
+    log_silent "$msg" && start_spinner "$msg" && sleep .5
+    cat "$laravel_web_snippet" >> "$laravel_web" 2> /dev/null
+    err_code=$?
+    if [[ $err_code -ne 0  || $fail -eq 1 ]]; then
+      stop_spinner 1
+      [[ $fail -eq 1 ]] && msg=$e_msg
+      log_silent -e "ERROR: $msg"
+    else
+      stop_spinner 0
+      log_silent "SUCCESS: $msg"
+    fi # end check success or failure
+  fi # end check if file is already injected
+else
+  log_silent "$msg" && start_spinner "$msg" && sleep .5 && stop_spinner 1
+  log_silent -e "ERROR: no $laravel_web file to inject"
+fi # end check injection file exists

.gp/bash/init-complete.sh

@@ -10,30 +10,9 @@
 # Notes:
 # Always call this file last from the 'init' command in .gitpod.yml
 
-# Laravel routes/web.php injection
-if ! grep -q "Injected from $laravel_web_snippet" "$laravel_web"; then
-  allow_mixed_web=$(bash .gp/bash/utils.sh parse_ini_value starter.ini laravel install)
-  if [[ $allow_mixed_web != 0 ]]; then
-    laravel_web=routes/web.php
-    laravel_web_snippet=.gp/snippets/laravel/routes/web/allow-mixed-web.snippet
-    if [[ -e $laravel_web ]]; then
-      msg="Injecting $laravel_web file"
-      [[ ! -e $laravel_web_snippet ]] && fail=1 && msg="Missing injection file $laravel_web_snippet"
-      [[ $fail != 1 ]] && log_silent "$msg" && start_spinner "$msg"
-      cat "$laravel_web_snippet" >> "$laravel_web"
-      err_code=$?
-      if [[ $err_code != 0  || $fail == 1 ]]; then
-        [[ $fail == 1 ]] || stop_spinner 1
-        log -e "ERROR: $msg"
-      else
-        stop_spinner 0
-        log_silent "SUCCESS: $msg"
-      fi
-    else
-      log "ERROR: no $laravel_web file to inject"
-    fi # end check injection file exists
-  fi # end check file to inject exists
-fi # end check if file to inject is already injected
+# routes/web.php injection
+allow_mixed_web=$(bash .gp/bash/utils.sh parse_ini_value starter.ini laravel allow_mixed_web)
+[[ $allow_mixed_web != 0 ]] && bash .gp/bash/directives/allow-mixed-web.sh
 
 # Summarize results
 bash .gp/bash/helpers.sh show_first_run_summary