From dc46b478bc6150232103123c668d40109efef1ff Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Fri, 27 May 2022 11:47:56 +0800
Subject: [PATCH] :hammer: Update build scripts

---
 build-ui.bat                               | 4 ----
 build-ui.sh                                | 6 ------
 darwin-build.sh => scripts/darwin-build.sh | 3 ++-
 linux-build.sh => scripts/linux-build.sh   | 6 +++++-
 win-build.bat => scripts/win-build.bat     | 6 ++++++
 5 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 build-ui.bat
 delete mode 100644 build-ui.sh
 rename darwin-build.sh => scripts/darwin-build.sh (92%)
 rename linux-build.sh => scripts/linux-build.sh (81%)
 rename win-build.bat => scripts/win-build.bat (91%)

diff --git a/build-ui.bat b/build-ui.bat
deleted file mode 100644
index 72f026822..000000000
--- a/build-ui.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-echo 'Building UI'
-cd app
-call npm install && npm run build
-cd ..
diff --git a/build-ui.sh b/build-ui.sh
deleted file mode 100644
index 4ed3010e1..000000000
--- a/build-ui.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo 'Building UI'
-cd app
-npm install && npm run build
-cd ..
diff --git a/darwin-build.sh b/scripts/darwin-build.sh
similarity index 92%
rename from darwin-build.sh
rename to scripts/darwin-build.sh
index 86100ab7d..76bf69a08 100644
--- a/darwin-build.sh
+++ b/scripts/darwin-build.sh
@@ -2,9 +2,10 @@
 
 echo 'Building UI'
 cd app
-npm run build
+npm install && npm run build
 cd ..
 
+echo 'Cleaning Builds'
 rm -rf app/build
 rm -rf app/kernel-darwin
 rm -rf app/kernel-darwin-arm64
diff --git a/linux-build.sh b/scripts/linux-build.sh
similarity index 81%
rename from linux-build.sh
rename to scripts/linux-build.sh
index 12cb730ce..96dd1e999 100644
--- a/linux-build.sh
+++ b/scripts/linux-build.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
-./build-ui.sh
+echo 'Building UI'
+cd app
+npm install && npm run build
+cd ..
 
+echo 'Cleaning Builds'
 rm -rf app/build
 rm -rf app/kernel-linux
 
diff --git a/win-build.bat b/scripts/win-build.bat
similarity index 91%
rename from win-build.bat
rename to scripts/win-build.bat
index bcc187982..d8e5337c4 100644
--- a/win-build.bat
+++ b/scripts/win-build.bat
@@ -1,4 +1,10 @@
+echo 'Building UI'
+cd app
+call npm install
+call npm run build
+cd ..
 
+echo 'Cleaning Builds'
 del /S /Q /F app\build 1>nul
 del /S /Q /F app\kernel 1>nul
 del /S /Q /F app\kernel32 1>nul