Skip to content

Omit -jar when -cp or -classpath is used in custom java arguments #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NZSmartie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Omit -jar when -cp or -classpath is used in custom java arguments #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/controllers/launch.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,10 +546,23 @@ app.controller 'LaunchCtrl', ($scope, $rootScope, $timeout, accessToken) ->
args.push("-Xms#{$scope.memory.initial}M")
args.push("-Xmx#{$scope.memory.max}M")
# Custom args
args.push arg for arg in $scope.launcherOptions.javaArgs.split(" ")
noJar = false
# Split arg by space, while retaining "" and '' gropups.
javaArgsSplit = $scope.launcherOptions.javaArgs
.split(/([^ '"]+(?:"[^"]+")?(?:=(?:"[^"]+"|[^ ]+))?|"[^"]+")/)
.filter((s) -> !s.match /^[\s]*$/)

for arg in javaArgsSplit
# don't use -jar when -classpath or -cp is provided.
if arg.startsWith("-classpath") || arg.startsWith("-cp")
noJar = true
args.push arg

# Jar args
args.push('-jar')
args.push(starmadeJar)
if !noJar
args.push('-jar')
args.push(starmadeJar)

args.push('-force') unless dedicatedServer
args.push('-server') if dedicatedServer
args.push('-gui') if dedicatedServer
Expand Down