[add] packing setup ui

jianyongchen · Oct 28, 2022 · 3e837fb · 3e837fb
1 parent 93ba063
commit 3e837fb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -160,11 +160,14 @@ artifacts-linux: clean
 	rm -f ../xgen-v1.0/pnpm-lock.yaml
 	echo "BASE=__yao_admin_root" > ../xgen-v1.0/packages/xgen/.env
 	cd ../xgen-v1.0 && pnpm install && pnpm run build
+#   Setup UI
+	cd ../xgen-v1.0/packages/setup  && pnpm install && pnpm run build
 
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui
 	cp -r ../xgen-v0.9/dist .tmp/data/xgen/v0.9
+	cp -r ../xgen-v1.0/packages/setup/build .tmp/data/xgen/setup
 	cp -r ../xgen-v1.0/packages/xgen/dist .tmp/data/xgen/v1.0
 	cp -r yao .tmp/data/
 	go-bindata -fs -pkg data -o data/bindata.go -prefix ".tmp/data/" .tmp/data/...
@@ -203,11 +206,15 @@ artifacts-macos: clean
 	rm -f ../xgen-v1.0/pnpm-lock.yaml
 	echo "BASE=__yao_admin_root" > ../xgen-v1.0/packages/xgen/.env
 	cd ../xgen-v1.0 && pnpm install && pnpm run build
+#   Setup UI
+	cd ../xgen-v1.0/packages/setup  && pnpm install && pnpm run build
+
 
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui
 	cp -r ../xgen-v0.9/dist .tmp/data/xgen/v0.9
+	cp -r ../xgen-v1.0/packages/setup/build .tmp/data/xgen/setup
 	cp -r ../xgen-v1.0/packages/xgen/dist .tmp/data/xgen/v1.0
 	cp -r yao .tmp/data/
 	go-bindata -fs -pkg data -o data/bindata.go -prefix ".tmp/data/" .tmp/data/...
@@ -279,7 +286,7 @@ release: clean
 	cp -r ./ui .tmp/data/ui
 	cp -r ./yao .tmp/data/yao
 	cp -r .tmp/xgen/v0.9/dist .tmp/data/xgen/v0.9
-	cp -r .tmp/xgen/v1.0/packages/xgen/build .tmp/data/xgen/setup
+	cp -r .tmp/xgen/v1.0/packages/setup/build .tmp/data/xgen/setup
 	cp -r .tmp/xgen/v1.0/packages/xgen/dist .tmp/data/xgen/v1.0
 	go-bindata -fs -pkg data -o data/bindata.go -prefix ".tmp/data/" .tmp/data/...
 	rm -rf .tmp/data
@@ -316,11 +323,15 @@ linux-release: clean
 	echo "BASE=__yao_admin_root" > .tmp/xgen/v1.0/packages/xgen/.env
 	cd .tmp/xgen/v1.0 && pnpm install && pnpm run build
 
+#   Setup UI
+	cd .tmp/xgen/v1.0/packages/setup  && pnpm install && pnpm run build
+
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui
 	cp -r ./yao .tmp/data/yao
 	cp -r .tmp/xgen/v0.9/dist .tmp/data/xgen/v0.9
+	cp -r .tmp/xgen/v1.0/packages/setup/build .tmp/data/xgen/setup
 	cp -r .tmp/xgen/v1.0/packages/xgen/dist .tmp/data/xgen/v1.0
 	go-bindata -fs -pkg data -o data/bindata.go -prefix ".tmp/data/" .tmp/data/...
 	rm -rf .tmp/data

diff --git a/setup/check.go b/setup/check.go
@@ -89,13 +89,24 @@ func hasInstalled(cfg config.Config) bool {
 	switch cfg.DB.Driver {
 
 	case "sqlite3":
-		if cfg.DB.Primary != nil {
+		if cfg.DB.Primary != nil && len(cfg.DB.Primary) > 0 {
+
+			dbfile, err := filepath.Abs(cfg.DB.Primary[0])
+			if err != nil {
+				return false
+			}
+
+			if _, err := os.Stat(dbfile); err != nil && os.IsNotExist(err) {
+				fmt.Println(dbfile)
+				return false
+			}
+
 			return true
 		}
 		break
 
 	case "mysql":
-		if cfg.DB.Primary != nil {
+		if cfg.DB.Primary != nil && len(cfg.DB.Primary) > 0 {
 			return true
 		}
 		break