Updating to use best practices

2 files changed, 29 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 088c56286648..fb5a087239d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = git-git
 	pkgdesc = A fast distributed version control system
-	pkgver = 2.15.0.r169.gd8df70f273
+	pkgver = 2.15.0.r276.g89ea799ffc
 	pkgrel = 1
 	url = http://git-scm.com/
 	install = git-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 23484a7d4026..01585a917f71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 
 _name=git
 pkgname=$_name-git
-pkgver=2.15.0.r169.gd8df70f273
+pkgver=2.15.0.r276.g89ea799ffc
 pkgrel=1
 pkgdesc='A fast distributed version control system'
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url='http://git-scm.com/'
-license=(GPL2)
-depends=(curl 'expat>=2.0' perl-error 'perl>=5.14.0' openssl pcre2
-         libgnome-keyring glib2-git libsecret)
-makedepends=(python2 emacs xmlto asciidoc)
+license=('GPL2')
+depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre2'
+         'libgnome-keyring' 'glib2-git' 'libsecret')
+makedepends=('python2' 'emacs' 'xmlto' 'asciidoc')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
@@ -26,13 +26,13 @@ optdepends=('tk: gitk and git gui'
             'subversion: git svn'
             'cvsps2: git cvsimport'
             'gnome-keyring: GNOME keyring credential helper')
-conflicts=(git)
-provides=(git)
+conflicts=('git')
+provides=('git')
 install=git-git.install
 source=('git+https://github.com/git/git.git'
-        git-daemon@.service
-        git-daemon.socket
-        git.sysusers)
+        'git-daemon@.service'
+        'git-daemon.socket'
+        'git.sysusers')
 sha512sums=('SKIP'
             'ad7f81859d5a3b9b93b48ab1fe317919940d666439e583984bf5287b6c62f570c192b990f4a004a5d0a2d983ed5e63aba2ccc95a42e05e1b93242fdbce2d07f5'
             'bd4aff421e547044a2a91b8a77c86ce14f05321008aa2e28aab35154b297803ca716ccba3e0fca3805033d4adb455adb41086ceeca98200b8006582c13f2c7d3'
@@ -65,7 +65,7 @@ check() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$_name"
   local jobs
-  jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') || true
+  jobs="$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')" || true
   mkdir -p /dev/shm/git-test
 
   # explicitly specify SHELL to avoid a test failure in t/t9903-bash-prompt.sh
@@ -95,24 +95,24 @@ package() {
     INSTALLDIRS=vendor DESTDIR="$pkgdir" install install-doc
 
   # bash completion
-  mkdir -p "$pkgdir/usr/share/bash-completion/completions/"
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir/usr/share/bash-completion/completions/git"
+  mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
+  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
 
   # fancy git prompt
-  mkdir -p "$pkgdir/usr/share/git/"
-  install -m644 ./contrib/completion/git-prompt.sh "$pkgdir/usr/share/git/git-prompt.sh"
+  mkdir -p "$pkgdir"/usr/share/git/
+  install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
 
   # emacs
   make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install
 
   # gnome credentials helper
   install -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
-      "$pkgdir/usr/lib/git-core/git-credential-gnome-keyring"
+      "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
   make -C contrib/credential/gnome-keyring clean
 
   # libsecret credentials helper
   install -m755 contrib/credential/libsecret/git-credential-libsecret \
-      "$pkgdir/usr/lib/git-core/git-credential-libsecret"
+      "$pkgdir"/usr/lib/git-core/git-credential-libsecret
   make -C contrib/credential/libsecret clean
 
   # subtree installation
@@ -123,27 +123,27 @@ package() {
 
   # the rest of the contrib stuff
   find contrib/ -name '.gitignore' -delete
-  cp -a ./contrib/* "$pkgdir/usr/share/git/"
+  cp -a ./contrib/* "$pkgdir"/usr/share/git/
 
   # scripts are for python 2.x
   sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
-    "$pkgdir/usr/share/git/remote-helpers/git-remote-bzr" \
-    "$pkgdir/usr/share/git/remote-helpers/git-remote-hg"
+    "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
+    "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
   sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
-    "$pkgdir/usr/share/git/svn-fe/svnrdump_sim.py"
+    "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
   # perl modules from contrib/ install to site dir... move to vendor
-  mv "$pkgdir"/usr/share/perl5/site_perl/Git/* "$pkgdir/usr/share/perl5/vendor_perl/Git/"
-  rm -rf "$pkgdir/usr/share/perl5/site_perl"
+  mv "$pkgdir"/usr/share/perl5/site_perl/Git/* "$pkgdir"/usr/share/perl5/vendor_perl/Git/
+  rm -rf "$pkgdir"/usr/share/perl5/site_perl
 
   # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf "$pkgdir/usr/lib/perl5"
+  rm -rf "$pkgdir"/usr/lib/perl5
 
   # git-daemon via systemd socket activation
-  install -D -m 644 "$srcdir/git-daemon@.service" "$pkgdir/usr/lib/systemd/system/git-daemon@.service"
-  install -D -m 644 "$srcdir/git-daemon.socket" "$pkgdir/usr/lib/systemd/system/git-daemon.socket"
+  install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service
+  install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 
   # Add git-daemon sysuser
-  install -D -m 644 "$srcdir/git.sysusers" "$pkgdir/usr/lib/sysusers.d/git.conf"
+  install -D -m 644 "$srcdir"/git.sysusers "$pkgdir"/usr/lib/sysusers.d/git.conf
 }