Skip to content

Commit

Permalink
git-extra: commit auto-generated changes
Browse files Browse the repository at this point in the history
The `makepkg-mingw` build updated the version and `git-extra.install`.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho committed Mar 5, 2025
1 parent 48e2403 commit aca5df3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion git-extra/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
pkgname=($_realname
"${MINGW_PACKAGE_PREFIX}-${_realname}")
_ver_base=1.1
pkgver=1.1.649.af5925057
pkgver=1.1.653.48e2403b3
pkgrel=1
pkgdesc="Git for Windows extra files"
arch=('any')
Expand Down
12 changes: 7 additions & 5 deletions git-extra/git-extra.install
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ GITATTRIBUTES
grep -q "$otherpacman" etc/pacman.conf ||
sed -i -e '/^\[mingw32\]/i['$otherpacman']\nServer = https://wingit.blob.core.windows.net/'$otherarch'\n' etc/pacman.conf

test -z "$(find /clangarm64 -type f -print -quit)" || # if /clangarm64 exists and contains at least one file
test -z "$(find /clangarm64 -type f -print -quit 2>/dev/null)" || # if /clangarm64 exists and contains at least one file
grep -q "git-for-windows-aarch64" etc/pacman.conf || # then add Git for Windows' aarch64 repository (unless it's already added)
sed -i -e '/^\[clangarm64]/i[git-for-windows-aarch64]\nServer = https://wingit.blob.core.windows.net/aarch64\n' etc/pacman.conf

Expand Down Expand Up @@ -247,10 +247,12 @@ test -d "$TMPDIR" || test ! -d "$TMP" || {\
}

# Enable color and syntax-highlighting in GNU nano
test ! -f /etc/nanorc ||
grep -q '^set titlecolor' /etc/nanorc ||
sed -i -e '/Paint the interface elements/,/root.s .nanorc/s/^# //' \
-e 's/^# \(include .*nanorc"\)$/\1/' /etc/nanorc
test ! -f /etc/nanorc || {
grep -q '^set titlecolor' /etc/nanorc ||
sed -i '/Paint the interface elements/,/root.s .nanorc/s/^# //' /etc/nanorc
grep -q '^include .*\*\.nanorc' /etc/nanorc ||
sed -i 's/^# \(include .*\*\.nanorc"\?\)$/\1/' /etc/nanorc
}

# Do not require /usr/bin/cmd in /usr/bin/start
grep -q '^"\$COMSPEC" ' /usr/bin/start ||
Expand Down

0 comments on commit aca5df3

Please sign in to comment.