spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-04-13 09:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUILDTOOLS-561: Improve support for paths with special characters

Browse source
This commit is contained in:
md_5 2021-01-13 10:10:20 +11:00
parent 7ca290a0c8
commit abd1c566d8
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/spigotmc/builder/Builder.java
View file

@ -191,9 +191,9 @@ public class Builder
{ {
if ( IS_WINDOWS ) if ( IS_WINDOWS )
{ {
String gitVersion = "PortableGit-2.24.1.2-" + ( System.getProperty( "os.arch" ).endsWith( "64" ) ? "64" : "32" ) + "-bit"; String gitVersion = "PortableGit-2.30.0-" + ( System.getProperty( "os.arch" ).endsWith( "64" ) ? "64" : "32" ) + "-bit";
// https://github.com/git-for-windows/git/releases/tag/v2.24.1.windows.2 // https://github.com/git-for-windows/git/releases/tag/v2.30.0.windows.1
String gitHash = System.getProperty( "os.arch" ).endsWith( "64" ) ? "cb75e4a557e01dd27b5af5eb59dfe28adcbad21638777dd686429dd905d13899" : "88f5525999228b0be8bb51788bfaa41b14430904bc65f1d4bbdcf441cac1f7fc"; String gitHash = System.getProperty( "os.arch" ).endsWith( "64" ) ? "6497e30fc6141e3c27af6cc3a081861043a7666dd54f395d47184e8eb75f5d61" : "b3768c64b6afa082043659c56acb4c3483df6b6e884fdc7e3c769f7e7e99a3a8";
msysDir = new File( gitVersion, "PortableGit" ); msysDir = new File( gitVersion, "PortableGit" );
if ( !msysDir.isDirectory() ) if ( !msysDir.isDirectory() )
@ -207,7 +207,7 @@ public class Builder
if ( !gitInstall.exists() ) if ( !gitInstall.exists() )
{ {
download( "https://static.spigotmc.org/git/" + gitName, gitInstall, HashFormat.SHA256, gitHash ); download( "https://github.com/git-for-windows/git/releases/download/v2.30.0.windows.1/" + gitName, gitInstall, HashFormat.SHA256, gitHash );
} }
System.out.println( "Extracting downloaded git install" ); System.out.println( "Extracting downloaded git install" );
@ -724,9 +724,9 @@ public class Builder
{ {
List<String> args = new LinkedList<String>(); List<String> args = new LinkedList<String>();
if ( IS_WINDOWS && false ) if ( IS_WINDOWS )
{ {
// TODO: BUILDTOOLS-561 args.add( maven.getAbsolutePath() + "/bin/mvn.cmd" );
} else } else
{ {
args.add( "sh" ); args.add( "sh" );