diff --git a/action.yml b/action.yml index 8b9571a..823bf63 100644 --- a/action.yml +++ b/action.yml @@ -1,8 +1,8 @@ name: "ZeroTier" description: "Connect your Github Action workflow to ZeroTier" branding: - icon: 'globe' - color: 'gray-dark' + icon: "globe" + color: "gray-dark" on: workflow_call: @@ -20,7 +20,7 @@ inputs: default: "https://my.zerotier.com/api/v1" runs: - using: 'composite' + using: "composite" steps: - name: zerotier uses: zerotier/github-action/util/post@main @@ -29,5 +29,5 @@ runs: AUTH_TOKEN: ${{ inputs.auth_token }} NETWORK_ID: ${{ inputs.network_id }} with: - main: ./main.sh - post: ./post.sh + main: $GITHUB_ACTION_PATH/main.sh + post: $GITHUB_ACTION_PATH/post.sh diff --git a/main.sh b/main.sh index 6707214..2814a64 100755 --- a/main.sh +++ b/main.sh @@ -2,15 +2,17 @@ set -euo pipefail IFS=$'\n\t' echo "⏁ Installing ZeroTier" +# /home/runner/work/zerotier-github-action/zerotier-github-action/./ +echo $GITHUB_ACTION_PATH case $(uname -s) in MINGW64_NT?*) - pwsh "./util/install.ps1" + pwsh "$GITHUB_ACTION_PATH/util/install.ps1" ztcli="/c/Program Files (x86)/ZeroTier/One/zerotier-cli.bat" member_id=$("${ztcli}" info | awk '{ print $3 }') ;; *) - . ./util/install.sh &>/dev/null + . $GITHUB_ACTION_PATH/util/install.sh &>/dev/null member_id=$(sudo zerotier-cli info | awk '{ print $3 }') ;; esac