fix: fix build errror

修复 -b 参数构建玲珑应用错误 Log: fix build error
linuxdeepin · May 15, 2024 · d8d203b · d8d203b
1 parent 1aedfda
commit d8d203b
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/cli/command/convert/convert.go b/cli/command/convert/convert.go
@@ -196,19 +196,20 @@ func runConvert(options *convertOptions) error {
 
 			// 构建玲珑包
 			if options.buildFlag {
-				if ret, msg, err := comm.ExecAndWait(10, "sh", "-c",
-					fmt.Sprintf("cd %s && ll-builder build", appPath)); err != nil {
-					log.Logger.Infof("build %s success.", packConfig.File.Deb[idx].Name)
+				buildLinglongPath := filepath.Dir(linglongYamlPath)
+				if ret, msg, err := comm.ExecAndWait(1<<10, "sh", "-c",
+					fmt.Sprintf("cd %s && ll-builder build", buildLinglongPath)); err != nil {
+					log.Logger.Warnf("msg: %+v err:%+v, out: %+v", msg, err, ret)
 				} else {
 					log.Logger.Warnf("msg: %+v err:%+v, out: %+v", msg, err, ret)
 				}
 
 				// 导出玲珑包
-				if ret, msg, err := comm.ExecAndWait(10, "sh", "-c",
-					fmt.Sprintf("cd %s && ll-builder export", appPath)); err != nil {
-					log.Logger.Infof("%s export success.", packConfig.File.Deb[idx].Name)
-				} else {
+				if ret, msg, err := comm.ExecAndWait(1<<10, "sh", "-c",
+					fmt.Sprintf("cd %s && ll-builder export", buildLinglongPath)); err != nil {
 					log.Logger.Warnf("msg: %+v err:%+v, out: %+v", msg, err, ret)
+					} else {
+					log.Logger.Infof("%s export success.", packConfig.File.Deb[idx].Name)
 				}
 			}
 		}