Skip to content

Commit

Permalink
Merge pull request #125 from A2uria/main
Browse files Browse the repository at this point in the history
mingw-w64-git: use /proc/cygdrive prefix in bin path when installing redirectors
  • Loading branch information
dscho authored Jul 19, 2024
2 parents 907ead4 + 3e9184f commit 3c1b7c5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,6 @@ jobs:
# reduce time required to install packages by disabling pacman's disk space checking
sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf &&
# help git-sdk-arm64 switch from `asciidoc` to `asciidoctor`
if test mingw-w64-git = '${{ matrix.directory }}'
then
packages=$(ls -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* 2>/dev/null |
sed -e 's|-[0-9].*||' -e 's|.*/||')
if test -n "$packages"
then
pacman -R --noconfirm $packages
fi &&
for prefix in /mingw32 /mingw64 /clangarm64
do
if test -x $prefix/bin/gem
then
PATH=$prefix/bin:$PATH gem uninstall asciidoctor
fi
done
fi &&
top_dir=$PWD &&
cd "${{ matrix.directory }}" &&
MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&
Expand Down
2 changes: 1 addition & 1 deletion mingw-w64-git/git.install
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mingw_prefix_path () {
}

bin_path () {
echo "$(cygpath -am / | sed 's/^\([A-Z]\):/\/\1/')/bin"
echo "$(cygpath -am / | sed 's/^\([A-Z]\):/\/proc\/cygdrive\/\1/')/bin"
}

copy_files () {
Expand Down

0 comments on commit 3c1b7c5

Please sign in to comment.