Try again

optimumBA · Sep 18, 2024 · 00e92c1 · 00e92c1
1 parent 5f341cb
commit 00e92c1
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 53 deletions.
diff --git a/.github/github_workflows.ex b/.github/github_workflows.ex
@@ -444,7 +444,7 @@ defmodule GithubWorkflows do
             [
               name: "Generate an app and start the server",
               if: "steps.result_cache.outputs.cache-hit != 'true'",
-              run: "SHELL=/bin/#{shell} make -f test/scripts/Makefile serve",
+              run: "source #{config_file} && make -f test/scripts/Makefile serve",
               shell: "/bin/#{shell} -l {0}"
             ],
             [

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -64,7 +64,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -101,7 +101,7 @@ jobs:
         shell: /bin/zsh -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/zsh make -f test/scripts/Makefile serve
+        run: source ~/.zshrc && make -f test/scripts/Makefile serve
         shell: /bin/zsh -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -138,7 +138,7 @@ jobs:
         shell: /bin/zsh -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/zsh make -f test/scripts/Makefile serve
+        run: source ~/.zshrc && make -f test/scripts/Makefile serve
         shell: /bin/zsh -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
@@ -30,7 +30,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -64,7 +64,7 @@ jobs:
         shell: /bin/bash -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/bash make -f test/scripts/Makefile serve
+        run: source ~/.bash_profile && make -f test/scripts/Makefile serve
         shell: /bin/bash -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -101,7 +101,7 @@ jobs:
         shell: /bin/zsh -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/zsh make -f test/scripts/Makefile serve
+        run: source ~/.zshrc && make -f test/scripts/Makefile serve
         shell: /bin/zsh -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'
@@ -138,7 +138,7 @@ jobs:
         shell: /bin/zsh -l {0}
       - name: Generate an app and start the server
         if: steps.result_cache.outputs.cache-hit != 'true'
-        run: SHELL=/bin/zsh make -f test/scripts/Makefile serve
+        run: source ~/.zshrc && make -f test/scripts/Makefile serve
         shell: /bin/zsh -l {0}
       - name: Check HTTP status code
         if: steps.result_cache.outputs.cache-hit != 'true'

diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh
@@ -44,19 +44,19 @@ esac
 function already_installed() {
     case "$1" in
     "Elixir")
-        mise which elixir >/dev/null 2>&1
+        which elixir >/dev/null 2>&1
         ;;
     "Erlang")
-        mise which erl >/dev/null 2>&1
+        which erl >/dev/null 2>&1
         ;;
     "mise")
         which mise >/dev/null 2>&1
         ;;
     "Phoenix")
-        mise exec mix phx.new --version >/dev/null 2>&1
+        mix phx.new --version >/dev/null 2>&1
         ;;
     "PostgreSQL")
-        mise which initdb >/dev/null 2>&1
+        which initdb >/dev/null 2>&1
         ;;
     *)
         echo "Invalid name argument on checking: $1"
@@ -80,16 +80,18 @@ function install() {
         case $current_shell in
         "bash" | "rbash")
             echo "eval \"\$(~/.local/bin/mise activate bash)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s bash)"
             ;;
         "zsh")
             echo "eval \"\$(~/.local/bin/mise activate zsh)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s zsh)"
             ;;
         esac
         ;;
     "Phoenix")
-        mise exec mix local.hex --force
-        mise exec mix local.rebar --force
-        mise exec mix archive.install --force hex phx_new $phoenix_version
+        mix local.hex --force
+        mix local.rebar --force
+        mix archive.install --force hex phx_new $phoenix_version
         ;;
     "PostgreSQL")
         sudo apt-get update
@@ -123,21 +125,21 @@ function add_env() {
     sleep 1.5
     maybe_install "mise"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "Erlang"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "Erlang"
 
     echo -e "${white}"
     sleep 1.5
     maybe_install "Elixir"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "Phoenix"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "Phoenix"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "PostgreSQL"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "PostgreSQL"
 
     echo -e "${white}"
     echo -e "${cyan}${bold}phx.tools setup is complete!"

diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh
@@ -44,10 +44,10 @@ esac
 function already_installed() {
     case "$1" in
     "Elixir")
-        mise which elixir >/dev/null 2>&1
+        which elixir >/dev/null 2>&1
         ;;
     "Erlang")
-        mise which erl >/dev/null 2>&1
+        which erl >/dev/null 2>&1
         ;;
     "Homebrew")
         which brew >/dev/null 2>&1
@@ -56,13 +56,13 @@ function already_installed() {
         which mise >/dev/null 2>&1
         ;;
     "Phoenix")
-        mise exec mix phx.new --version >/dev/null 2>&1
+        mix phx.new --version >/dev/null 2>&1
         ;;
     "PostgreSQL")
-        mise which initdb >/dev/null 2>&1
+        which initdb >/dev/null 2>&1
         ;;
     "Xcode Command Line Tools")
-        which xcode-select >/dev/null
+        which xcode-select >/dev/null 2>&1
         ;;
     *)
         echo "Invalid name argument on checking: $1"
@@ -89,16 +89,18 @@ function install() {
         case $current_shell in
         "bash" | "rbash")
             echo "eval \"\$(~/.local/bin/mise activate bash)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s bash)"
             ;;
         "zsh")
             echo "eval \"\$(~/.local/bin/mise activate zsh)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s zsh)"
             ;;
         esac
         ;;
     "Phoenix")
-        mise exec mix local.hex --force
-        mise exec mix local.rebar --force
-        mise exec mix archive.install --force hex phx_new $phoenix_version
+        mix local.hex --force
+        mix local.rebar --force
+        mix archive.install --force hex phx_new $phoenix_version
         ;;
     "PostgreSQL")
         brew install gcc readline zlib curl ossp-uuid
@@ -130,33 +132,33 @@ function maybe_install() {
 function add_env() {
     echo ""
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "Xcode Command Line Tools"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "Xcode Command Line Tools"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "Homebrew"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "Homebrew"
 
     echo -e "${white}"
     sleep 1.5
     maybe_install "mise"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "Erlang"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "Erlang"
 
     echo -e "${white}"
     sleep 1.5
     maybe_install "Elixir"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "Phoenix"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "Phoenix"
 
-    echo -e "${white}"
-    sleep 1.5
-    maybe_install "PostgreSQL"
+    # echo -e "${white}"
+    # sleep 1.5
+    # maybe_install "PostgreSQL"
 
     echo -e "${white}"
     echo -e "${cyan}${bold}phx.tools setup is complete!"

diff --git a/test/scripts/Makefile b/test/scripts/Makefile
@@ -4,9 +4,17 @@ SHELL := $(shell echo $$SHELL)
 .SHELLFLAGS := -eu -c
 
 serve:
-	mise exec initdb -D ~/pgdata -U postgres
-	mise exec pg_ctl start -D ~/pgdata
-	mise exec mix phx.new --no-install phx_tools_test
+	rm -f .tool-versions
+
+	@if [[ "$$SHELL" == *"bash"* ]]; then \
+ 		eval "$$(~/.local/bin/mise hook-env -s bash)"; \
+ 	elif [[ "$$SHELL" == *"zsh"* ]]; then \
+ 		eval "$$(~/.local/bin/mise hook-env -s zsh)"; \
+ 	fi
+
+	# initdb -D ~/pgdata -U postgres
+	# pg_ctl start -D ~/pgdata
+	mix phx.new --no-install phx_tools_test
 	cd phx_tools_test
-	mise exec mix setup
-	mise exec elixir --erl '-detached' -S mix phx.server
+	mix setup
+	elixir --erl '-detached' -S mix phx.server