From 59cda5758b1a5aedda3a9e46cc36526887a1ffb9 Mon Sep 17 00:00:00 2001
From: liweigang <liweiganga@uniontech.com>
Date: Wed, 22 Jun 2022 14:21:02 +0800
Subject: [PATCH] fix: unified use desktop-version-server.in

---
 Makefile                                 | 16 ++--------------
 files/desktop-version-arm-server.in      |  9 ---------
 files/desktop-version-loongson-server.in |  9 ---------
 files/desktop-version-sw-server.in       |  9 ---------
 4 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 files/desktop-version-arm-server.in
 delete mode 100644 files/desktop-version-loongson-server.in
 delete mode 100644 files/desktop-version-sw-server.in

diff --git a/Makefile b/Makefile
index 1a3e7ca..45f3b8b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,42 +13,30 @@ build:
 		cp -v files/appstore_loongson.json files/appstore.json
         endif
         ifeq (${ARCH_BUILD}, x86_64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
         else ifeq (${ARCH_BUILD}, x86_32)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
 
         else ifeq (${ARCH_BUILD}, i686)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
         else ifeq (${ARCH_BUILD}, mipsel)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-mips > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips > files/os-version
         else ifeq (${ARCH_BUILD}, mips64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-mips > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips > files/os-version
         else ifeq (${ARCH_BUILD}, sw_64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-sw > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw > files/os-version
         else ifeq (${ARCH_BUILD}, aarch64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm-server.in > files/desktop-version
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm-server.in > files/desktop-version-server
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-arm > files/os-license		
 		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > files/os-version
         endif
+	sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version
+	sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version-server
 	sed -e "s|@@VERSION@@|20|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release
 
 install:
diff --git a/files/desktop-version-arm-server.in b/files/desktop-version-arm-server.in
deleted file mode 100644
index e66b575..0000000
--- a/files/desktop-version-arm-server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Release]
-Version=@@VERSION@@
-Type=Server
-Type[zh_CN]=服务器版
-Edition=Y2020E0002
-Copyright=Y2020CR002
-[Addition]
-Milestone=@@RELEASE@@
-Buildid=build1
diff --git a/files/desktop-version-loongson-server.in b/files/desktop-version-loongson-server.in
deleted file mode 100644
index e66b575..0000000
--- a/files/desktop-version-loongson-server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Release]
-Version=@@VERSION@@
-Type=Server
-Type[zh_CN]=服务器版
-Edition=Y2020E0002
-Copyright=Y2020CR002
-[Addition]
-Milestone=@@RELEASE@@
-Buildid=build1
diff --git a/files/desktop-version-sw-server.in b/files/desktop-version-sw-server.in
deleted file mode 100644
index e66b575..0000000
--- a/files/desktop-version-sw-server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Release]
-Version=@@VERSION@@
-Type=Server
-Type[zh_CN]=服务器版
-Edition=Y2020E0002
-Copyright=Y2020CR002
-[Addition]
-Milestone=@@RELEASE@@
-Buildid=build1
-- 
2.20.1