Merge pull request #4012 from uberhacker/update-git-package

Update git from 2.25.0 to 2.26.0

install.sh

@@ -54,8 +54,8 @@ case "${ARCH}" in
   sha256s+=('5e485a0320b298e1f5c4ff50d98c6fe6d06ad9a38d9119d580a8b469418e1e6a')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.15-1-chromeos-armv7l.tar.xz')
   sha256s+=('cfa05a46d37d49479047f205e3d4ab2a8c11f953ed91e11465a1195ff2d95d01')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-armv7l.tar.xz')
-  sha256s+=('fa8607a7314095e4b164b80a38f2ce3d2fc38b20b94725f49144813e45a2528a')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-armv7l.tar.xz')
+  sha256s+=('41978feff6d8c94969475f97061cf6918f9a89c28d5b761bd0e58b5e74179708')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-armv7l.tar.xz')
   sha256s+=('497e146e4d769aa85b0d547889784d7552e2aadbbaa448df5bbe9515cd94c182')
   ;;
@@ -70,8 +70,8 @@ case "${ARCH}" in
   sha256s+=('5e485a0320b298e1f5c4ff50d98c6fe6d06ad9a38d9119d580a8b469418e1e6a')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.15-1-chromeos-armv7l.tar.xz')
   sha256s+=('cfa05a46d37d49479047f205e3d4ab2a8c11f953ed91e11465a1195ff2d95d01')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-armv7l.tar.xz')
-  sha256s+=('fa8607a7314095e4b164b80a38f2ce3d2fc38b20b94725f49144813e45a2528a')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-armv7l.tar.xz')
+  sha256s+=('41978feff6d8c94969475f97061cf6918f9a89c28d5b761bd0e58b5e74179708')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-armv7l.tar.xz')
   sha256s+=('497e146e4d769aa85b0d547889784d7552e2aadbbaa448df5bbe9515cd94c182')
   ;;
@@ -82,8 +82,8 @@ case "${ARCH}" in
   sha256s+=('6f4a5b96c31ef5ee4f09ac15da4c7a4a9d838ed5233038136ead1e155d17f342')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.15-1-chromeos-i686.tar.xz')
   sha256s+=('b080cd1e667dd9efba1a4392c7c177f5b8292f1b6fc29e862634b7ad41d29ab5')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-i686.tar.xz')
-  sha256s+=('45d03c624429a6b5948fb6344f737f37a3cdf149e06b75c4623d565a94314d3e')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-i686.tar.xz')
+  sha256s+=('50ffce89ffe648be451310404c8faf305c1e32c4259a49362b3f47a91c974c2b')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-i686.tar.xz')
   sha256s+=('dd2172bf82e3ffc1cfd06463108a36de55ba5e4bc2eb283852b54a737e087fe4')
   ;;
@@ -94,8 +94,8 @@ case "${ARCH}" in
   sha256s+=('352b78fc883cf8936136991fda9ca5d49e90b2951626158d6af8ef4b58d67f97')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.15-1-chromeos-x86_64.tar.xz')
   sha256s+=('7ac97b03fff5d1befecb26ac471daa239c2c23ab1bc774a5366e6c46d1bb9ad3')
-  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-x86_64.tar.xz')
-  sha256s+=('498fc3cafd8f23dff28480064c54c0da3d44a78541ea57bf4dbc584658f05aca')
+  urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-x86_64.tar.xz')
+  sha256s+=('7742e36511e15181cb076834a505b4d3cede3117986378b78015a83823a41b06')
   urls+=('https://dl.bintray.com/chromebrew/chromebrew/libssh2-1.9.0-chromeos-x86_64.tar.xz')
   sha256s+=('d02623da747ecc95acdba69a056220ef579b01dae82a0cbfec2aa96c2ea8e914')
   ;;

packages/git.rb

@@ -3,25 +3,25 @@ require 'package'
 class Git < Package
   description 'Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.'
   homepage 'https://git-scm.com/'
-  version '2.25.0'
-  source_url 'https://github.com/git/git/archive/v2.25.0.tar.gz'
-  source_sha256 '99d336613ca3f1d689349330178e7ad67945aae206552905340ac8f4f904979d'
+  version '2.26.0'
+  source_url 'https://github.com/git/git/archive/v2.26.0.tar.gz'
+  source_sha256 '2a93b9a3276464507922134bfba9be466427ab6a843e3773849050e3d05250d0'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.25.0-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.26.0-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: 'fa8607a7314095e4b164b80a38f2ce3d2fc38b20b94725f49144813e45a2528a',
-     armv7l: 'fa8607a7314095e4b164b80a38f2ce3d2fc38b20b94725f49144813e45a2528a',
-       i686: '45d03c624429a6b5948fb6344f737f37a3cdf149e06b75c4623d565a94314d3e',
-     x86_64: '498fc3cafd8f23dff28480064c54c0da3d44a78541ea57bf4dbc584658f05aca',
+    aarch64: '41978feff6d8c94969475f97061cf6918f9a89c28d5b761bd0e58b5e74179708',
+     armv7l: '41978feff6d8c94969475f97061cf6918f9a89c28d5b761bd0e58b5e74179708',
+       i686: '50ffce89ffe648be451310404c8faf305c1e32c4259a49362b3f47a91c974c2b',
+     x86_64: '7742e36511e15181cb076834a505b4d3cede3117986378b78015a83823a41b06',
   })
 
   depends_on 'curl' => :build
-  depends_on 'python27' => :build     # requires python2
+  depends_on 'python3' => :build
   depends_on 'libiconv'
 
   # need to build using single core
@@ -34,7 +34,7 @@ class Git < Package
            "--prefix=#{CREW_PREFIX}",
            "--libdir=#{CREW_LIB_PREFIX}",
            "--with-perl=#{CREW_PREFIX}/bin/perl",
-           "--with-python=#{CREW_PREFIX}/bin/python2",
+           "--with-python=#{CREW_PREFIX}/bin/python3",
            "--with-gitconfig=#{CREW_PREFIX}/etc/gitconfig",
            "--with-gitattributes=#{CREW_PREFIX}/etc/gitattributes"
     system "#{@make_cmd} all"
@@ -43,7 +43,7 @@ class Git < Package
   def self.install
     system "#{@make_cmd} DESTDIR=#{CREW_DEST_DIR} install"
     FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/git-completion"
-    system "cp -a contrib/completion/. #{CREW_DEST_PREFIX}/share/git-completion/"
+    FileUtils.cp_r Dir.glob('contrib/completion/.'), "#{CREW_DEST_PREFIX}/share/git-completion/"
   end
 
   def self.postinstall