Commits
DerFrZocker authored and md_5 committed 2d225730018
| 37 37 | import java.net.URLConnection; |
| 38 38 | import java.nio.file.FileSystem; |
| 39 39 | import java.nio.file.FileSystemException; |
| 40 40 | import java.nio.file.FileSystems; |
| 41 41 | import java.nio.file.Path; |
| 42 42 | import java.security.KeyManagementException; |
| 43 43 | import java.security.NoSuchAlgorithmException; |
| 44 44 | import java.security.SecureRandom; |
| 45 45 | import java.security.cert.X509Certificate; |
| 46 46 | import java.text.MessageFormat; |
| 47 + | import java.util.ArrayList; |
| 47 48 | import java.util.Arrays; |
| 48 49 | import java.util.Collections; |
| 49 50 | import java.util.Date; |
| 50 51 | import java.util.EnumSet; |
| 51 52 | import java.util.Enumeration; |
| 52 53 | import java.util.LinkedList; |
| 53 54 | import java.util.List; |
| 54 55 | import java.util.Set; |
| 55 56 | import java.util.function.Predicate; |
| 56 57 | import java.util.jar.JarFile; |
| 191 192 | if ( options.has( skipCompileFlag ) ) |
| 192 193 | { |
| 193 194 | compile = Collections.singletonList( Compile.NONE ); |
| 194 195 | System.err.println( "--skip-compile is deprecated, please use --compile NONE" ); |
| 195 196 | } |
| 196 197 | if ( ( dev || dontUpdate ) && options.has( jenkinsVersion ) ) |
| 197 198 | { |
| 198 199 | System.err.println( "Using --dev or --dont-update with --rev makes no sense, exiting." ); |
| 199 200 | System.exit( 1 ); |
| 200 201 | } |
| 202 + | if ( compile.isEmpty() && !pullRequests.isEmpty() ) |
| 203 + | { |
| 204 + | compile = new ArrayList<>(); |
| 205 + | if ( getPullRequest( Repository.BUKKIT ) != null || getPullRequest( Repository.CRAFTBUKKIT ) != null ) |
| 206 + | { |
| 207 + | compile.add( Compile.CRAFTBUKKIT ); |
| 208 + | } |
| 209 + | |
| 210 + | if ( getPullRequest( Repository.SPIGOT ) != null ) |
| 211 + | { |
| 212 + | compile.add( Compile.SPIGOT ); |
| 213 + | } |
| 214 + | } |
| 201 215 | |
| 202 216 | try |
| 203 217 | { |
| 204 218 | runProcess( CWD, "sh", "-c", "exit" ); |
| 205 219 | } catch ( Exception ex ) |
| 206 220 | { |
| 207 221 | if ( IS_WINDOWS ) |
| 208 222 | { |
| 209 223 | String gitVersion = "PortableGit-2.30.0-" + ( System.getProperty( "os.arch" ).endsWith( "64" ) ? "64" : "32" ) + "-bit"; |
| 210 224 | // https://github.com/git-for-windows/git/releases/tag/v2.30.0.windows.1 |