Merge pull request #286 from telerik/unzip

Use info-zip based unzip on windows, and OS supplied one on linux

Author: teobugslayer

commands/post-install.ts

@@ -13,7 +13,6 @@ export class PostInstallCommand implements ICommand {
 
 	constructor(private $fs: IFileSystem,
 		private $staticConfig: Config.IStaticConfig,
-		private $childProcess: IChildProcess,
 		private $commandsService: ICommandsService,
 		private $htmlHelpService: IHtmlHelpService,
 		private $sysInfo: ISysInfo,
@@ -43,8 +42,6 @@ export class PostInstallCommand implements ICommand {
 				this.printAppBuilderWarnings(sysInfo);
 			}
 
-			this.checkSevenZip().wait();
-
 			this.$commandsService.tryExecuteCommand("autocomplete", []).wait();
 		}).future<void>()();
 	}
@@ -139,10 +136,5 @@ export class PostInstallCommand implements ICommand {
 			+ "or http://docs.oracle.com/javase/7/docs/webnotes/install/ (for JDK 7)." + os.EOL);
 		}
 	}
-
-	private checkSevenZip(): IFuture<void> {
-		var sevenZipErrorMessage = util.format(PostInstallCommand.SEVEN_ZIP_ERROR_MESSAGE, this.$staticConfig.SYS_REQUIREMENTS_LINK);
-		return this.$childProcess.tryExecuteApplication(this.$staticConfig.sevenZipFilePath, ["-h"], "exit", sevenZipErrorMessage);
-	}
 }
 $injector.registerCommand("dev-post-install", PostInstallCommand);

definitions/config.d.ts

@@ -11,7 +11,6 @@ declare module Config {
 		version: string;
 		helpTextPath: string;
 		adbFilePath: string;
-		sevenZipFilePath: string;
 		disableAnalytics?: boolean;
 		disableHooks?: boolean;
 		enableDeviceRunCommandOnWindows?: boolean;

file-system.ts

@@ -6,6 +6,7 @@ import Future = require("fibers/future");
 import path = require("path");
 import util = require("util");
 import rimraf = require("rimraf");
+import minimatch = require("minimatch");
 import hostInfo = require("./host-info");
 
 export class FileSystem implements IFileSystem {
@@ -55,20 +56,38 @@ export class FileSystem implements IFileSystem {
 		return (() => {
 			var shouldOverwriteFiles = !(options && options.overwriteExisitingFiles === false);
 			var isCaseSensitive = !(options && options.caseSensitive === false);
-			
-			//the wild card symbol at the end is required in order for the -ssc- switch of 7zip to behave properly
-			zipFile = isCaseSensitive ? zipFile : zipFile + '*';
 
 			this.createDirectory(destinationDir).wait();
-			var args =  <string[]>(_.flatten(['x', shouldOverwriteFiles ? "-y" : "-aos", '-o' + destinationDir, isCaseSensitive ? '-ssc' : '-ssc-', zipFile, fileFilters || []]));
 
-			var $childProcess = this.$injector.resolve("childProcess");
-			var $staticConfig = this.$injector.resolve("staticConfig");
+			var proc: string;
+			if (hostInfo.isWindows()) {
+				proc = path.join(__dirname, "resources/platform-tools/unzip/win32/unzip");
+			} else if (hostInfo.isDarwin()) {
+				proc = "unzip"; // darwin unzip is info-zip
+			} else if (hostInfo.isLinux()) {
+				proc = "unzip"; // linux unzip is info-zip
+			}
+
+			if (!isCaseSensitive) {
+				zipFile = this.findFileCaseInsensitive(zipFile);
+			}
+
+			var args =  <string[]>(_.flatten(['-b', shouldOverwriteFiles ? "-o" : "-n", isCaseSensitive ? [] : '-C', zipFile, fileFilters || [], '-d', destinationDir]));
 
-			$childProcess.spawnFromEvent($staticConfig.sevenZipFilePath, args, "close", { stdio: "ignore", detached: true }).wait();
+			var $childProcess = this.$injector.resolve("childProcess");
+			$childProcess.spawnFromEvent(proc, args, "close", { stdio: "ignore", detached: true }).wait();
 		}).future<void>()();
 	}
 
+	private findFileCaseInsensitive(file: string): string {
+		var dir = path.dirname(file);
+		var basename = path.basename(file);
+		var entries = this.readDirectory(dir).wait();
+		var match = minimatch.match(entries, basename, {nocase:true, nonegate: true, nonull: true})[0];
+		var result = path.join(dir, match);
+		return result;
+	}
+
 	public exists(path: string): IFuture<boolean> {
 		var future = new Future<boolean>();
 		fs.exists(path, (exists: boolean) => future.return(exists));

resources/platform-tools/unzip/darwin/7za

@@ -17,10 +17,6 @@ export class StaticConfigBase implements Config.IStaticConfig {
 		return null;
 	}
 
-	public get sevenZipFilePath(): string {
-		return path.join(__dirname, util.format("resources/platform-tools/unzip/%s/7za", process.platform));
-	}
-
 	public get adbFilePath(): string {
 		return path.join(__dirname, util.format("resources/platform-tools/android/%s/adb", process.platform));
 	}