Add javaentities
# Conflicts: # redistruable/javaentities/java.go
This commit is contained in:
parent
010a8becd7
commit
b02c858b38
@ -8,11 +8,14 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/api"
|
||||
"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/downloader"
|
||||
>>>>>>> 7b3396a (Add java entities)
|
||||
=======
|
||||
>>>>>>> 368286c (Add javaentities)
|
||||
)
|
||||
|
||||
type JavaVersion struct {
|
||||
@ -26,12 +29,18 @@ type JavaMetas struct {
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 368286c (Add javaentities)
|
||||
func (jm JavaMetas) GetOsURL() (string, error) {
|
||||
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 7b3396a (Add java entities)
|
||||
=======
|
||||
>>>>>>> 368286c (Add javaentities)
|
||||
type JavaMeta struct {
|
||||
Version struct {
|
||||
Major string `json:"major"`
|
||||
@ -61,9 +70,12 @@ func (s Specifics) getOsJava() (SpecificJavaVersion, error) {
|
||||
|
||||
func (v *JavaVersion) CheckNotExists(launcherPath string) bool {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 7b3396a (Add java entities)
|
||||
=======
|
||||
>>>>>>> 368286c (Add javaentities)
|
||||
javaBinPath := path.Join(launcherPath, ".redist", "java", v.GetString())
|
||||
_, err := os.Stat(javaBinPath)
|
||||
|
||||
@ -81,6 +93,7 @@ func (v *JavaVersion) GetString() string {
|
||||
return stringBuilder.String()
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
func (v *JavaVersion) DownloadLatest(downloadDir string) (downloader.DownloadFile, error) {
|
||||
@ -111,3 +124,5 @@ func (v *JavaVersion) DownloadLatest(downloadDir string) (downloader.DownloadFil
|
||||
return task, nil
|
||||
}
|
||||
>>>>>>> 7b3396a (Add java entities)
|
||||
=======
|
||||
>>>>>>> 368286c (Add javaentities)
|
||||
|
Loading…
Reference in New Issue
Block a user