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

Add javaentities

Browse Source 
# Conflicts:
#	redistruable/javaentities/java.go
This commit is contained in:
cyber-dream 2023-02-03 01:35:04 +03:00
parent 010a8becd7
commit b02c858b38
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
redistruable/javaentities/java.go
View File

@ -8,11 +8,14 @@ import (
"strconv" "strconv"
"strings" "strings"
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/api" "git.gregbrzezinski.com/Skirda/skirdaGoLauncher/api"
"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/downloader" "git.gregbrzezinski.com/Skirda/skirdaGoLauncher/downloader"
>>>>>>> 7b3396a (Add java entities) >>>>>>> 7b3396a (Add java entities)
=======
>>>>>>> 368286c (Add javaentities)
) )
type JavaVersion struct { type JavaVersion struct {
@ -26,12 +29,18 @@ type JavaMetas struct {
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 368286c (Add javaentities)
func (jm JavaMetas) GetOsURL() (string, error) { func (jm JavaMetas) GetOsURL() (string, error) {
} }
<<<<<<< HEAD
======= =======
>>>>>>> 7b3396a (Add java entities) >>>>>>> 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"`
@ -61,9 +70,12 @@ func (s Specifics) getOsJava() (SpecificJavaVersion, error) {
func (v *JavaVersion) CheckNotExists(launcherPath string) bool { func (v *JavaVersion) CheckNotExists(launcherPath string) bool {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
>>>>>>> 7b3396a (Add java entities) >>>>>>> 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)
@ -81,6 +93,7 @@ func (v *JavaVersion) GetString() string {
return stringBuilder.String() return stringBuilder.String()
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
func (v *JavaVersion) DownloadLatest(downloadDir string) (downloader.DownloadFile, error) { func (v *JavaVersion) DownloadLatest(downloadDir string) (downloader.DownloadFile, error) {
@ -111,3 +124,5 @@ func (v *JavaVersion) DownloadLatest(downloadDir string) (downloader.DownloadFil
return task, nil return task, nil
} }
>>>>>>> 7b3396a (Add java entities) >>>>>>> 7b3396a (Add java entities)
=======
>>>>>>> 368286c (Add javaentities)