From 6d5f7d1d2c210bb9498ed7b8024e9cbe3bc58c43 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Thu, 19 Oct 2023 11:06:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=80=82=E9=85=8Dvue3=E6=96=B0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- makefile | 5 +++-- mkpkg.sh | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 767b7107..aa57aa1c 100644 --- a/makefile +++ b/makefile @@ -26,6 +26,7 @@ EmsBEDir = $(GitLocalRoot)/ems.agt ConfigEtcDir = $(EmsBEDir)/config/etc ConfigSystemdDir = $(EmsBEDir)/config/systemd EmsFEDir = $(GitLocalRoot)/fe.ems +EmsFEVue3Dir = $(GitLocalRoot)/fe.ems.vue3/dist LibDir = $(EmsBEDir)/lib RESTAGENT = restagent CRONTASK = crontask @@ -108,7 +109,7 @@ deb: $(BINNAME) cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir) rm -rf $(FrontBuildDir)/* mkdir -p $(FrontBuildDir)/front - cp -rf $(EmsFEDir)/* $(FrontBuildDir)/front >/dev/null + cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null chmod 755 $(BuildOMCBinDir)/* chmod 755 $(DebBuildDir)/DEBIAN/preinst chmod 755 $(DebBuildDir)/DEBIAN/postinst @@ -144,7 +145,7 @@ rpm: $(BINNAME) rm -rf $(FrontBuildDir)/* #unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null mkdir -p $(FrontBuildDir)/front - cp -rf $(EmsFEDir)/* $(FrontBuildDir)/front >/dev/null + cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null chmod 755 $(BuildOMCBinDir)/* # chmod 755 $(BinDir2)/* rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/* diff --git a/mkpkg.sh b/mkpkg.sh index 74b9d41d..e5de37ec 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -4,7 +4,6 @@ ProcList="restagent crontask sshsvc captrace data2html" GitLocalRoot=$HOME/local.git EmsBEDir=$GitLocalRoot/ems.agt EmsBuildRoot=$GitLocalRoot/build.ems -EmsFEDir=$GitLocalRoot/fe.ems RpmArch=`arch` RpmsDir=$EmsBuildRoot/rpmbuild/RPMS/ ReleaseDir=$EmsBuildRoot/release