From 8d1bb58754fa452edd445e6736e1f2c4cb8e4249 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Tue, 16 Feb 2016 22:07:35 +0100 Subject: [PATCH 1/2] Fix 'make version' to adjust the user's custom map path --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca1c56e8bc..5d68c4ae48 100644 --- a/Makefile +++ b/Makefile @@ -363,7 +363,7 @@ version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml m @for i in $? ; do \ awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \ awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \ - awk '{sub("/[^/]*@User$$", "/$(VERSION)@User"); print $0}' $${i}.tmp2 > $${i} && \ + awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp2 > $${i} && \ rm $${i}.tmp $${i}.tmp2; \ done From 9e799537f864768039712a262025d3e52efd5a7a Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 20 Feb 2016 15:42:48 +0100 Subject: [PATCH 2/2] Fix make version on windows --- make.ps1 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/make.ps1 b/make.ps1 index 1df06d5a34..ce7981e8eb 100644 --- a/make.ps1 +++ b/make.ps1 @@ -113,7 +113,17 @@ elseif ($command -eq "version") { $replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) sc $mod $replacement - $replacement = (gc $mod) -Replace "modchooser:.*", ("modchooser: {0}" -f $version) + + # The tab is a workaround for not replacing inside of "Packages:" + $replacement = (gc $mod) -Replace " modchooser:.*", (" modchooser: {0}" -f $version) + sc $mod $replacement + + $prefix = $(gc $mod) | Where { $_.ToString().EndsWith(": User") } + if ($prefix -and $prefix.LastIndexOf("/") -ne -1) + { + $prefix = $prefix.Substring(0, $prefix.LastIndexOf("/")) + } + $replacement = (gc $mod) -Replace ".*: User", ("{0}/{1}: User" -f $prefix, $version) sc $mod $replacement } echo ("Version strings set to '{0}'." -f $version)