Skip to content

Commit

Permalink
fix locations
Browse files Browse the repository at this point in the history
  • Loading branch information
mxcl committed Oct 5, 2023
1 parent e9f8214 commit 957cbcf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion actions/setup-brewkit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
# build itself. This is a workaround for
# https://github.com/pkgxdev/libpkgx/pull/46
run: |
d="${PKGX_DIR:-$HOME/.pkgx}/tea.xyz/brewkit"
d="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/brewkit"
mkdir -p "$d"
cp -R $GITHUB_ACTION_PATH/../.. "$d/gha-temp"
ln -s gha-temp "$d/v0"
Expand Down
4 changes: 2 additions & 2 deletions bin/pkg
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ shift

if test "$arg" = "-v" || test "$arg" = "--version"; then
d="$(cd "$(dirname "$0")"/.. && pwd)"
if echo "$d" | grep -q "${PKGX_DIR:-$HOME/.pkgx}/tea.xyz/brewkit"; then
V="${d#"${PKGX_DIR:-$HOME/.pkgx}"/tea.xyz/brewkit/}"
if echo "$d" | grep -q "${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/brewkit"; then
V="${d#"${PKGX_DIR:-$HOME/.pkgx}"/pkgx.sh/brewkit/}"
else
V="$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*")-dev"
fi
Expand Down

0 comments on commit 957cbcf

Please sign in to comment.