Skip to content

Fix artifact name #17

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
stone-wall wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix artifact name #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aad357d
fix artifact names
stone-wall Oct 14, 2019
868abdf
Merge branch 'master' of https://github.com/runelite-extended/OpenOSR…
stone-wall Oct 15, 2019
9fd8e5e
fixes problem with client artifact name
stone-wall Oct 31, 2019
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
11 changes: 8 additions & 3 deletions src/main/kotlin/dev/openosrs/strapper/controllers/StrapController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,17 @@ class StrapController() : Controller() {
}


private val clientArtifactPrefix: String
get() {
val clientArtifactPrefix = "runelite-client-"
return clientArtifactPrefix
}

fun buildBootstrap(dir: File) {
newBootstrap.launcherJvm11Arguments = bootstrap.launcherJvm11Arguments
File(
File(dir, "runelite-client/build/libs"),
"client-$projectVersion-${newBootstrap.client.extension}"
"$clientArtifactPrefix$projectVersion-${newBootstrap.client.extension}"
)

newBootstrap.artifacts.addAll(DependencyParser(dir).artifacts)
Expand Down Expand Up @@ -197,8 +203,7 @@ class StrapController() : Controller() {
for (s in artifactsList) {
val artifactRepo = "https://github.com/open-osrs/hosting/raw/master/"
if (s.contains("runelite-client")) {
val fName = "${s.replace("runelite-", "")
.split("/")[0]}-$rlVersion.${bootstrap.client.extension}"
val fName = "${s.split("/")[0]}-$rlVersion.${bootstrap.client.extension}"
try {
artifactFiles[fName] = File(File(dir, s), fName)
} catch (e: FileNotFoundException) {
Expand Down
3 changes: 0 additions & 3 deletions src/main/kotlin/dev/openosrs/strapper/exceptions/VersionException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package dev.openosrs.strapper.exceptions

class VersionException(throwable: Throwable) : Exception() {
override fun initCause(cause: Throwable?): Throwable {
return super.initCause(cause)
}

override val message: String?
get() = super.message
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/dev/openosrs/strapper/models/Bootstrap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class Bootstrap : JsonModel {

override fun toJSON(json: JsonBuilder) {
with (json) {
add("name", name + version)
add("name", path.split("/")[path.split("/").size - 1])
add("path", path)
add("size", size)
add("hash", hash)
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/dev/openosrs/strapper/views/UI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class UI : View("OpenOSRS Bootstrapper") {
}
}

var completion = SimpleDoubleProperty(0.0)
private var progressLabel = SimpleStringProperty("Click Update to start")


Expand Down