fix: modifiable parent directory

jiro4989 · Jul 8, 2024 · e8476e9 · e8476e9
1 parent 54dd991
commit e8476e9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/action.yml b/action.yml
@@ -13,6 +13,11 @@ inputs:
     description: >-
       The Nim compiler installation directory.
     default: '.nim_runtime'
+  parent-nim-install-directory:
+    description: >-
+      The Nim compiler installation parent directory.
+      It will be placed in the current directory if this parameter is empty.
+    default: ''
   repo-token:
     description: 'The GITHUB_TOKEN secret'
     required: false
@@ -34,25 +39,39 @@ runs:
       run: |
         "${{ github.action_path }}/install_nim.sh" \
           --nim-version "${{ inputs.nim-version }}" \
+          --parent-nim-install-directory "${{ inputs.parent-nim-install-directory }}" \
           --nim-install-directory "${{ inputs.nim-install-directory }}" \
           --os "${{ runner.os }}" \
           --repo-token "${{ inputs.repo-token }}"
 
     - name: Set PATH for Unix
       shell: bash
       run: |
-        echo "$PWD/${{ inputs.nim-install-directory }}/bin" >> "$GITHUB_PATH"
+        parent="${{ inputs.parent-nim-install-directory }}"
+        if [[ "${parent}" = "" ]]; then
+          parent="$PWD"
+        fi
+        echo "$parent/${{ inputs.nim-install-directory }}/bin" >> "$GITHUB_PATH"
         echo "$HOME/.nimble/bin" >> "$GITHUB_PATH"
       if: runner.os != 'Windows'
 
     - name: Set PATH for Windows
       shell: pwsh
       run: |
-        echo "$Pwd\${{ inputs.nim-install-directory }}\bin" >> $Env:GITHUB_PATH
+        $parent = "${{ inputs.parent-nim-install-directory }}"
+        if ($parent -eq "") {
+          $parent = "$Pwd"
+        }
+        echo "$parent\${{ inputs.nim-install-directory }}\bin" >> $Env:GITHUB_PATH
         mkdir -Force ~\.nimble\bin
         (Resolve-Path ~\.nimble\bin).Path >> $Env:GITHUB_PATH
       if: runner.os == 'Windows'
 
+    - name: Print nim directory
+      shell: bash
+      run: |
+        echo "installed nim fullpath: $(which nim)"
+
     - name: Print nim version
       shell: bash
       run: nim -v

diff --git a/install_nim.sh b/install_nim.sh
@@ -38,6 +38,7 @@ nim_version="stable"
 nim_install_dir=".nim_runtime"
 os="Linux"
 repo_token=""
+parent_nim_install_dir=""
 while ((0 < $#)); do
   opt=$1
   shift
@@ -48,6 +49,9 @@ while ((0 < $#)); do
     --nim-install-directory)
       nim_install_dir=$1
       ;;
+    --parent-nim-install-directory)
+      parent_nim_install_dir=$1
+      ;;
     --os)
       os=$1
       ;;
@@ -57,6 +61,12 @@ while ((0 < $#)); do
   esac
 done
 
+if [[ "$parent_nim_install_dir" = "" ]]; then
+  parent_nim_install_dir="$PWD"
+fi
+
+cd "$parent_nim_install_dir"
+
 # build nim compiler for devel branch
 if [[ "$nim_version" = "devel" ]]; then
   if [[ "$os" = Windows ]]; then