Merge branch 'develop'

Author: chkr1011

Diff for: .gitignore

@@ -12,3 +12,4 @@ __vm/
 HA4IoT.opensdf
 HA4IoT.sdf
 *.VC.opendb
+HA4IoT.VC.db

Diff for: App/DeployApps.ps1

@@ -29,15 +29,15 @@ function Deploy
 }
 
 function SelectIP
-{
-	Write-Host "Select IP of target:";
+{   
+	Write-Host "Select IP of controller:";
 	Write-Host "0 - 192.168.1.15";
 	Write-Host "1 - 192.168.1.16";
     Write-Host "2 - minwinpc";
     Write-Host "----------------";
 	Write-Host "c - <custom>";
 
-	$choice = Read-Host
+	$choice = [Console]::ReadKey($true).KeyChar;
 
 	switch($choice)
 	{
@@ -61,10 +61,10 @@ function Confirm()
 
 	if ($key -eq "y")
 	{
-		return 1;
+		return $true;
 	}
 
-	return 0;
+	return $false;
 }
 
 function IncreaseVersion
@@ -79,9 +79,31 @@ function IncreaseVersion
 	#Set-Content - $versionFile
 }
 
+function GetIsStaging
+{
+	Write-Host "Select slot:";
+	Write-Host "0 - Live";
+	Write-Host "1 - Staging";
+	
+	$choice = [Console]::ReadKey($true).KeyChar;
+	
+	if ($choice -eq 0)
+	{
+		return $false;
+	}
+
+	return $true;
+}
+
 ## Start...
 Set-Location $PSScriptRoot
+
+Write-Host "----------------------------------";
+Write-Host "--- HA4IoT App deployment tool ---";
+Write-Host "----------------------------------";
+
 $ip = SelectIP
+$isStaging = GetIsStaging
 
 $repeat = 1
 while($repeat)
@@ -97,9 +119,15 @@ while($repeat)
 	Write-Host "Found package: $package";
 
 	$clearRemoteDirectory = Confirm("Clear remote directory (y/n)?")
+	
 	$sourceDir = ".\HA4IoT.WebApp"
 	$remoteDir = "$package\LocalState\App"
 
+	if ($isStaging)
+	{
+		$remoteDir = "$remoteDir\STAGING";
+	}
+
 	#IncreaseVersion -Package "$remoteDir"
 
 	Deploy -Source ".\HA4IoT.WebApp" -Target "$remoteDir" -Clear $clearRemoteDirectory