From 7ca1830129c9af64d0c58cd9bffef3b90a1b58e6 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 15:59:38 +0800 Subject: [PATCH 1/7] d --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index dd8fe6e9..b2e31c99 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak 's/YYYYMMDD/$(`date +%Y%m%d`)/g' $(DebBuildDir)/DEBIAN/control + sed -i.bak 's/YYYYMMDD/`date +%Y%m%d`/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) From 70a21e60f7765f6dad729a22f64bc49147da304a Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 16:00:18 +0800 Subject: [PATCH 2/7] f --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index b2e31c99..3269c0bc 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak 's/YYYYMMDD/`date +%Y%m%d`/g' $(DebBuildDir)/DEBIAN/control + sed -i.bak 's/YYYYMMDD/echo `date +%Y%m%d`/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) From 822c2cf533ecbbf47a5458b58426bdbe4eda7864 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 16:04:14 +0800 Subject: [PATCH 3/7] i --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 3269c0bc..674dfa98 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak 's/YYYYMMDD/echo `date +%Y%m%d`/g' $(DebBuildDir)/DEBIAN/control + sed -i.bak 's/YYYYMMDD/`echo $(RelDate)`/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) From 014dc2efe5b1a74f6f341ebbce5c4dcc0487b113 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 16:05:58 +0800 Subject: [PATCH 4/7] d --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 674dfa98..b2d000ff 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak 's/YYYYMMDD/`echo $(RelDate)`/g' $(DebBuildDir)/DEBIAN/control + sed -i.bak 's/YYYYMMDD/'$(date +"%Y%m%d")'/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) From fb4ec50b3b9e448504482fbf6d9145db12533b2d Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 16:07:10 +0800 Subject: [PATCH 5/7] d --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index b2d000ff..b852199c 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak 's/YYYYMMDD/'$(date +"%Y%m%d")'/g' $(DebBuildDir)/DEBIAN/control + sed -i.bak "s/YYYYMMDD/$(date +"%Y%m%d")/g" $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) From 53308ed01986c713b10c52055555d8cb3bcdba6d Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 16:16:14 +0800 Subject: [PATCH 6/7] d --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index b852199c..b2d000ff 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak "s/YYYYMMDD/$(date +"%Y%m%d")/g" $(DebBuildDir)/DEBIAN/control + sed -i.bak 's/YYYYMMDD/'$(date +"%Y%m%d")'/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME) From 682b161f14dc57868e6824e282b9496f3f39b67a Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 15 Sep 2023 16:17:47 +0800 Subject: [PATCH 7/7] d --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index b2d000ff..5690ba7d 100644 --- a/makefile +++ b/makefile @@ -98,7 +98,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - sed -i.bak 's/YYYYMMDD/'$(date +"%Y%m%d")'/g' $(DebBuildDir)/DEBIAN/control + #sed -i.bak 's/YYYYMMDD/'$(date +"%Y%m%d")'/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb rpm: $(BINNAME)