Skirda/sharedutils
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix file

Browse Source
This commit is contained in:
cyber-dream 2023-02-03 01:36:40 +03:00
parent b02c858b38
commit 4238de8568
1 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
redistruable/javaentities/java.go
View File

@ -7,15 +7,6 @@ import (
"runtime" "runtime"
"strconv" "strconv"
"strings" "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 { type JavaVersion struct {
@ -28,19 +19,10 @@ type JavaMetas struct {
JavaVersions []JavaMeta `json:"javaVersions"` JavaVersions []JavaMeta `json:"javaVersions"`
} }
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 368286c (Add javaentities)
func (jm JavaMetas) GetOsURL() (string, error) { func (jm JavaMetas) GetOsURL() (string, error) {
} }
<<<<<<< HEAD
=======
>>>>>>> 7b3396a (Add java entities)
=======
>>>>>>> 368286c (Add javaentities)
type JavaMeta struct { type JavaMeta struct {
Version struct { Version struct {
Major string `json:"major"` Major string `json:"major"`
@ -69,13 +51,6 @@ func (s Specifics) getOsJava() (SpecificJavaVersion, error) {
} }
func (v *JavaVersion) CheckNotExists(launcherPath string) bool { func (v *JavaVersion) CheckNotExists(launcherPath string) bool {
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7b3396a (Add java entities)
=======
>>>>>>> 368286c (Add javaentities)
javaBinPath := path.Join(launcherPath, ".redist", "java", v.GetString()) javaBinPath := path.Join(launcherPath, ".redist", "java", v.GetString())
_, err := os.Stat(javaBinPath) _, err := os.Stat(javaBinPath)
@ -92,37 +67,3 @@ func (v *JavaVersion) GetString() string {
return stringBuilder.String() return stringBuilder.String()
} }
<<<<<<< HEAD
<<<<<<< HEAD
=======
func (v *JavaVersion) DownloadLatest(downloadDir string) (downloader.DownloadFile, error) {
javaVersionMeta := JavaMetas{}
task := downloader.DownloadFile{
Url: "",
Path: "",
}
javaVersionMeta, err := api.GetJavaVersionMetas()
// if err := downloadJson("https://skirda.gregbrzezinski.com/java_version_manifest.json", &javaVersionMeta); err != nil {
// return task, errors.New("error in download json")
// }
// javaSpecific := SpecificJavaVersion{}
javaSpecific, err := javaVersionMeta.getOsJava()
if err != nil {
return task, err
}
task = downloader.DownloadFile{
Url: javaSpecific.URL,
Path: path.Join(downloadDir, v.GetString()),
}
return task, nil
}
>>>>>>> 7b3396a (Add java entities)
=======
>>>>>>> 368286c (Add javaentities)