From f839e96ea7eb715161ed44bb3acfe749cde4f428 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 6 Feb 2016 15:14:35 +0000
Subject: [PATCH] Use versioned user map directories.

---
 Makefile          | 5 +++--
 mods/cnc/mod.yaml | 2 +-
 mods/d2k/mod.yaml | 2 +-
 mods/ra/mod.yaml  | 2 +-
 mods/ts/mod.yaml  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c17639e7c6..ca1c56e8bc 100644
--- a/Makefile
+++ b/Makefile
@@ -362,8 +362,9 @@ all-dependencies: cli-dependencies windows-dependencies osx-dependencies
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i} && \
-		rm $${i}.tmp ; \
+		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \
+		awk '{sub("/[^/]*@User$$", "/$(VERSION)@User"); print $0}' $${i}.tmp2 > $${i} && \
+		rm $${i}.tmp $${i}.tmp2; \
 	done
 
 docs: utility mods version
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 28eb0efd39..678824630b 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -33,7 +33,7 @@ Packages:
 
 MapFolders:
 	./mods/cnc/maps@System
-	~^maps/cnc@User
+	~^maps/cnc/{DEV_VERSION}@User
 
 Rules:
 	./mods/cnc/rules/misc.yaml
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 2eed4948b1..e4f7b3a036 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -22,7 +22,7 @@ Packages:
 
 MapFolders:
 	d2k:maps@System
-	~^maps/d2k@User
+	~^maps/d2k/{DEV_VERSION}@User
 
 Rules:
 	d2k:rules/misc.yaml
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 94c8dc2961..ca647d5529 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -32,7 +32,7 @@ Packages:
 
 MapFolders:
 	./mods/ra/maps@System
-	~^maps/ra@User
+	~^maps/ra/{DEV_VERSION}@User
 
 Rules:
 	./mods/ra/rules/misc.yaml
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 283f92dfa4..69242bbca7 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -55,7 +55,7 @@ Packages:
 
 MapFolders:
 	./mods/ts/maps@System
-	~^maps/ts@User
+	~^maps/ts/{DEV_VERSION}@User
 
 Rules:
 	./mods/ts/rules/ai.yaml