src: add InstallFile preset.json

yuk7 · Feb 8, 2022 · ca9f996 · ca9f996
1 parent 18d800a
commit ca9f996
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/install/execute.go b/src/install/execute.go
@@ -17,15 +17,22 @@ func Execute(name string, args []string) {
 	if !wsllib.WslIsDistributionRegistered(name) {
 		var rootPath string
 		var showProgress bool
+		jsonPreset, _ := preset.ReadParsePreset()
 		switch len(args) {
 		case 0:
 			rootPath = detectRootfsFiles()
+			if jsonPreset.InstallFile != "" {
+				rootPath = jsonPreset.InstallFile
+			}
 			showProgress = true
 
 		case 1:
 			showProgress = false
 			if args[0] == "--root" {
 				rootPath = detectRootfsFiles()
+				if jsonPreset.InstallFile != "" {
+					rootPath = jsonPreset.InstallFile
+				}
 			} else {
 				rootPath = args[0]
 			}
@@ -58,12 +65,9 @@ func Execute(name string, args []string) {
 			utils.ErrorExit(err, showProgress, true, args == nil)
 		}
 
-		json, err2 := preset.ReadParsePreset()
-		if err2 == nil {
-			if json.WslVersion == 1 || json.WslVersion == 2 {
-				wslexe := utils.GetWindowsDirectory() + "\\System32\\wsl.exe"
-				_, err = exec.Command(wslexe, "--set-version", name, strconv.Itoa(json.WslVersion)).Output()
-			}
+		if jsonPreset.WslVersion == 1 || jsonPreset.WslVersion == 2 {
+			wslexe := utils.GetWindowsDirectory() + "\\System32\\wsl.exe"
+			_, err = exec.Command(wslexe, "--set-version", name, strconv.Itoa(jsonPreset.WslVersion)).Output()
 		}
 
 		if err == nil {

diff --git a/src/lib/preset/model_preset.go b/src/lib/preset/model_preset.go
@@ -1,5 +1,6 @@
 package preset
 
 type Preset struct {
-	WslVersion int `json:"wslversion,omitempty"`
+	WslVersion  int    `json:"wslversion,omitempty"`
+	InstallFile string `json:"installfile,omitempty"`
 }