Try again

optimumBA · Sep 18, 2024 · 948d27d · 948d27d
1 parent ee548b8
commit 948d27d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/.github/github_workflows.ex b/.github/github_workflows.ex
@@ -390,7 +390,7 @@ defmodule GithubWorkflows do
 
     config_file =
       case shell do
-        "bash" -> "~/.bashrc"
+        "bash" -> "~/.bash_profile"
         "zsh" -> "~/.zshrc"
       end
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -286,7 +286,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && SHELL=/bin/bash make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -320,7 +320,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && SHELL=/bin/bash make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -290,7 +290,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && SHELL=/bin/bash make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -324,7 +324,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: source ~/.bashrc && SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && SHELL=/bin/bash make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'

diff --git a/lib/phx_tools_web/components/seo_meta_tag_component.ex b/lib/phx_tools_web/components/seo_meta_tag_component.ex
@@ -24,8 +24,8 @@ defmodule PhxToolsWeb.SeoMetaTagComponent do
     assigns =
       assigns
       |> assign_new(:description, fn -> String.trim(@default_description) end)
-      |> assign_new(:keywords, fn -> @keywords end)
       |> assign_new(:image_url, fn -> static_url(Endpoint, ~p"/images/phx_tools.png") end)
+      |> assign_new(:keywords, fn -> @keywords end)
       |> assign_new(:url, fn
         %{attributes: %{url: url}} -> url
         _assigns -> url(~p"/")

diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 # Make sure important variables exist if not already defined
 #
@@ -30,7 +30,7 @@ current_shell=$(basename "$SHELL")
 
 case $current_shell in
 "bash" | "rbash")
-    config_file="$HOME/.bashrc"
+    config_file="$HOME/.bash_profile"
     ;;
 "zsh")
     config_file="$HOME/.zshrc"
@@ -88,6 +88,7 @@ function install() {
         ;;
     "Phoenix")
         mix local.hex --force
+        mix local.rebar --force
         mix archive.install --force hex phx_new $phoenix_version
         ;;
     "PostgreSQL")
@@ -149,7 +150,7 @@ phx_tools="
         ██████╗░██╗░░██╗██╗░░██╗  ████████╗░█████╗░░█████╗░██╗░░░░░░██████╗ 
         ██╔══██╗██║░░██║╚██╗██╔╝  ╚══██╔══╝██╔══██╗██╔══██╗██║░░░░░██╔════╝ 
         ██████╔╝███████║░╚███╔╝░  ░░░██║░░░██║░░██║██║░░██║██║░░░░░╚█████╗░ 
-        ██╔═══╝░██╔══██║���██╔██╗░  ░░░██║░░░██║░░██║██║░░██║██║░░░░░░╚═══██╗ 
+        ██╔═══╝░██╔══██║░██╔██╗░  ░░░██║░░░██║░░██║██║░░██║██║░░░░░░╚═══██╗ 
         ██║░░░░░██║░░██║██╔╝╚██╗  ░░░██║░░░╚█████╔╝╚█████╔╝███████╗██████╔╝ 
         ╚═╝░░░░░╚═╝░░╚═╝╚═╝░░╚═╝  ░░░╚═╝░░░░╚════╝░░╚════╝░╚══════╝╚═════╝░ 
 "

diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 # Make sure important variables exist if not already defined
 #
@@ -30,7 +30,7 @@ current_shell=$(basename "$SHELL")
 
 case $current_shell in
 "bash" | "rbash")
-    config_file="$HOME/.bashrc"
+    config_file="$HOME/.bash_profile"
     ;;
 "zsh")
     config_file="$HOME/.zshrc"
@@ -65,7 +65,7 @@ function already_installed() {
         which xcode-select >/dev/null
         ;;
     *)
-        echo "Invalid name argument on checking"
+        echo "Invalid name argument on checking: $1"
         exit 1
         ;;
     esac
@@ -95,6 +95,7 @@ function install() {
         ;;
     "Phoenix")
         mix local.hex --force
+        mix local.rebar --force
         mix archive.install --force hex phx_new $phoenix_version
         ;;
     "PostgreSQL")
@@ -108,7 +109,8 @@ function install() {
         xcode-select --install
         ;;
     *)
-        echo "Invalid name argument on install"
+        echo "Invalid name argument on install: $1"
+        exit 1
         ;;
     esac
 }

diff --git a/test/scripts/Makefile b/test/scripts/Makefile
@@ -7,5 +7,6 @@ serve:
 	initdb -D ~/pgdata -U postgres
 	pg_ctl start -D ~/pgdata
 	mix phx.new --no-install phx_tools_test
-	cd phx_tools_test && mix local.rebar --force && mix setup
-	cd phx_tools_test && elixir --erl '-detached' -S mix phx.server
+	cd phx_tools_test
+	mix setup
+	elixir --erl '-detached' -S mix phx.server