From 13e2105278fe6d59b6ab136823c8748a3f893514 Mon Sep 17 00:00:00 2001
From: Luke Sampson <me@lukesampson.com>
Date: Fri, 9 Aug 2013 10:59:46 +1000
Subject: [PATCH] setting =dumb disables output formatting for git

---
 concfg.json     | 2 +-
 cowsay.json     | 2 +-
 curl.json       | 2 +-
 go.json         | 2 +-
 perl.json       | 6 ++----
 postgresql.json | 2 +-
 pshazz.json     | 2 +-
 scriptcs.json   | 2 +-
 vim.json        | 2 +-
 winmerge.json   | 2 +-
 10 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/concfg.json b/concfg.json
index 1ef0a59cc7..2604ec6056 100644
--- a/concfg.json
+++ b/concfg.json
@@ -2,6 +2,6 @@
 	"homepage": "https://github.com/lukesampson/concfg",
 	"version": "0.2013.07.01",
 	"url": "https://github.com/lukesampson/concfg/archive/master.zip",
-	"unzip_folder": "concfg-master",
+	"extract_subdir": "concfg-master",
 	"bin": "bin\\concfg.ps1"
 }
\ No newline at end of file
diff --git a/cowsay.json b/cowsay.json
index cc7d59da19..d1ce1f76df 100644
--- a/cowsay.json
+++ b/cowsay.json
@@ -2,6 +2,6 @@
 	"version": "0.2013.07.19",
 	"homepage": "https://github.com/lukesampson/cowsay-psh",
 	"url": "https://github.com/lukesampson/cowsay-psh/archive/master.zip",
-	"unzip_folder": "cowsay-psh-master",
+	"extract_subdir": "cowsay-psh-master",
 	"bin": ["cowsay.ps1","cowthink.ps1"]
 }
\ No newline at end of file
diff --git a/curl.json b/curl.json
index 43827990a2..597efed899 100644
--- a/curl.json
+++ b/curl.json
@@ -6,7 +6,7 @@
 		"http://curl.haxx.se/gknw.net/7.30.0/dist-w32/curl-7.30.0-rtmp-ssh2-ssl-sspi-zlib-idn-static-bin-w32.zip",
 		"http://curl.haxx.se/ca/cacert.pem#/curl-ca-bundle.crt"
 	],
-	"unzip_folder": "curl-7.30.0-rtmp-ssh2-ssl-sspi-zlib-idn-static-bin-w32",
+	"extract_subdir": "curl-7.30.0-rtmp-ssh2-ssl-sspi-zlib-idn-static-bin-w32",
 	"hash": [
 		"sha256:90af768c246136c14a2ae52e8775fa4d976eda4632159bc565e1a539b4f15e1a",
 		null
diff --git a/go.json b/go.json
index 5b3dd1de3f..ffe363f0ee 100644
--- a/go.json
+++ b/go.json
@@ -12,7 +12,7 @@
 			"hash": "sha1:dee46d45e27193c14e07e695aa4c13d7fdc9de9b"
 		}
 	},
-	"unzip_folder": "go",
+	"extract_subdir": "go",
 	"add_env_path": "bin",
 	"set_env": {
 		"GOROOT": "$dir"
diff --git a/perl.json b/perl.json
index e10cf9e855..e054f88bc4 100644
--- a/perl.json
+++ b/perl.json
@@ -1,6 +1,7 @@
 {
 	"homepage": "http://strawberryperl.com",
 	"version": "5.16.3.1",
+	"license": "GPL",
 	"architecture": {
 		"32bit": {
 			"url": "http://strawberryperl.com/download/5.16.3.1/strawberry-perl-5.16.3.1-32bit-portable.zip",
@@ -11,8 +12,5 @@
 			"hash": "sha256:5c07f6340401f43f1e0fd71d967dde434a8a32491f35114ad825f648458398ee"
 		}
 	},
-	"add_env_path": ["perl\\site\\bin", "perl\\bin"],
-	"set_env": {
-		"TERM": "dumb"
-	}
+	"add_env_path": ["perl\\site\\bin", "perl\\bin"]
 }
\ No newline at end of file
diff --git a/postgresql.json b/postgresql.json
index bcc08bdfda..d8bd3faf7b 100644
--- a/postgresql.json
+++ b/postgresql.json
@@ -12,7 +12,7 @@
 			"hash": "sha256:26bd5d1555a3c010b0c58a4aaf5e1acd16bcf819926984f0716496d326768502"
 		}
 	},
-	"unzip_folder": "pgsql",
+	"extract_subdir": "pgsql",
 	"bin": [
 		"bin\\clusterdb.exe",
 		"bin\\createdb.exe",
diff --git a/pshazz.json b/pshazz.json
index de8fab58fd..392530025b 100644
--- a/pshazz.json
+++ b/pshazz.json
@@ -1,6 +1,6 @@
 {
 	"version": "0.2013.07.10",
 	"url": "https://github.com/lukesampson/pshazz/archive/master.zip",
-	"unzip_folder": "pshazz-master",
+	"extract_subdir": "pshazz-master",
 	"bin": [ "bin\\pshazz.ps1" ]
 }
\ No newline at end of file
diff --git a/scriptcs.json b/scriptcs.json
index 0965a1d42d..116389c487 100644
--- a/scriptcs.json
+++ b/scriptcs.json
@@ -3,7 +3,7 @@
 	"version": "0.6.0-alpha-130707",
 	"license": "Apache 2.0",
 	"url": "https://www.myget.org/F/scriptcsnightly/api/v2/package/scriptcs/0.6.0-alpha-130707?fn=/dl.zip",
-	"unzip_folder": "tools\\scriptcs",
+	"extract_subdir": "tools\\scriptcs",
 	"hash": "sha256:d0521827f09813cb3e22402e32a0089cf0b425981f3182568c47811717682750",
 	"bin": "scriptcs.exe"
 }
\ No newline at end of file
diff --git a/vim.json b/vim.json
index ae82b82cad..e0e6e5de1b 100644
--- a/vim.json
+++ b/vim.json
@@ -12,7 +12,7 @@
 		"md5:e16ec5b633d2f00bf511529e6abf3670",
 		"sha256:f6081071fa95a6f49c049e9d2aed2d2a2632ec47635b4b497a97bab5f5add498"
 	],
-	"unzip_folder": "vim\\vim73",
+	"extract_subdir": "vim\\vim73",
 	"bin": [ "vim.exe", "vimtutor.ps1" ],
 	"post_install": "if(!(test-path ~\\.vimrc)) {
 		cp \"$(split-path(scoop which vim))\\vimrc_example.vim\" ~\\.vimrc
diff --git a/winmerge.json b/winmerge.json
index 8b49d5b3cf..cdc1d288e5 100644
--- a/winmerge.json
+++ b/winmerge.json
@@ -3,6 +3,6 @@
 	"license": "GPL2",
 	"url": "http://downloads.sourceforge.net/project/winmerge/stable/2.14.0/WinMerge-2.14.0-exe.zip",
 	"hash": "sha256:9c77580ff9594536ce84dbbf0095e4b8654892a713989c378b9349c833c0f177",
-	"unzip_folder": "WinMerge-2.14.0-exe",
+	"extract_subdir": "WinMerge-2.14.0-exe",
 	"bin": "WinMergeU.exe"
 }
\ No newline at end of file