Minor bugfixes

Author: SquidDev

bsrocks/downloaders/github.lua

@@ -1,5 +1,23 @@
+local tree = require "bsrocks.downloaders.tree"
+
 local downloaders = {
-	require "bsrocks.downloaders.github",
+	-- GitHub
+	function(source, files)
+		local url = source.url
+		if not url then return end
+
+		local repo = url:match("git://github%.com/(.*)")
+		local branch = source.branch or source.tag or "master"
+		if not repo then
+			-- If we have the archive then we can also fetch from GitHub
+			repo, branch = url:match("https?://github%.com/(.*)/archive/(.*).tar.gz")
+			if not repo then return end
+		end
+
+		print("Downloading " .. repo .. "@" .. branch)
+		return tree('https://raw.github.com/'..repo..'/'..branch..'/', files)
+	end,
+
 }
 
 return function(source, files)

bsrocks/downloaders/init.lua

@@ -42,8 +42,6 @@ local function save(rockS, patchS)
 		files = applyPatches(downloaded, downloadPatch, patchS.patches or {}, patchS.added or {}, patchS.removed or {})
 	end
 
-	rockspec.saveFiles(rockS, downloaded, installDirectory)
-
 	local build = rockS.build
 	if build then
 		if build.modules then
@@ -149,7 +147,7 @@ local function install(name, version, constraints)
 	local patchManifest = patchspec.findPatchspec(name)
 
 	if not version then
-		if patchspec then
+		if patchManifest then
 			version = patchManifest.patches[name]
 		else
 			version = rockspec.latestVersion(rockManifest, name, constraints)