Merge pull request 'Add domain to the collected information' (#11) from Add_Domain into master

Reviewed-on: #11

README.md

@@ -24,6 +24,18 @@ It currently outputs:
 
 ## Quick Run
 
+### From USB Stick
+
+Download the USB_Run.zip latest release from [Releases](https://efrick.ddns.net/git/efrick/Sysinfo/releases).
+
+Unzip and copy the folder to a USB stick.
+
+Click on the file `quickrun.bat`
+
+This will put the output file into the directory it was run from.
+
+### From Web
+
 Copy and past into `CMD` 
 
 **[Note:]** must be run from an admin prompt.
@@ -36,11 +48,12 @@ Powershell.exe -command "$current_execution_policy = Get-ExecutionPolicy; Set-Ex
 
 This copies the bat file to a temporary location and runs it with the command switch to write the results to the desktop.
 
-### Powershell Breakout
+#### Powershell Breakout
 Below is a breakout of the Powershell commands run by the Quickrun above.
 
 ```powershell
-$current_execution_policy = Get-ExecutionPolicy; Set-ExecutionPolicy Bypass CurrentUser
+$current_execution_policy = Get-ExecutionPolicy
+Set-ExecutionPolicy Bypass CurrentUser
 (New-Object System.Net.WebClient).DownloadFile("https://efrick.ddns.net/git/efrick/Sysinfo/raw/branch/master/sysinfo.ps1", "sysinfo.ps1")
 .\sysinfo.ps1 -write_output
 rm .\sysinfo.ps1

quickrun.bat

@@ -2,8 +2,5 @@ ECHO off
 REM Runs the quick run commands form the readme.md
 REM https://efrick.ddns.net/git/efrick/Sysinfo/src/branch/master/README.md#quick-run
 REM This must be run from an elevated prompt.
-curl https://efrick.ddns.net/git/efrick/Sysinfo/raw/branch/master/sysinfo.ps1 > %userprofile%\AppData\Local\Temp\sysinfo.ps1;
 
-Powershell.exe -command "cd $env:userprofile; AppData\Local\Temp\sysinfo.ps1 -write_output"
+Powershell.exe -command "$current_execution_policy = Get-ExecutionPolicy; Set-ExecutionPolicy Bypass CurrentUser;$current_path = pwd; .\sysinfo.ps1 -write_output -file_location $current_path.Path"
-
-del %userprofile%\AppData\Local\Temp\sysinfo.ps1

sysinfo.ps1

@@ -57,6 +57,7 @@ function Find-Computer-Info {
 
     #Init array for storing computer's data
     $computer_info = @("HOSTNAME:", $cs.Name, 
+                       "Domain:", $cs.Domain,
                        "OS Version:", $computer_os_info.Caption,
                        "OS Architecture:", $computer_os_info.OSArchitecture,
                        "Manufacture:", $cs.manufacturer,
@@ -94,6 +95,7 @@ function Show-Computer-Info { # Function writes by default to stdout. If given a
 
 function Find-Computer-Info_7 {
     $cs_hostname = wmic computersystem get name
+    $cs_domain = wmic computersystem get Domain
     $os_name = wmic os get Caption
     $os_arch =  wmic computersystem get SystemType
     $cpu_name = wmic cpu get name
@@ -105,6 +107,7 @@ function Find-Computer-Info_7 {
 
     $computer_info_7 = @(
         "HOSTNAME:", $cs_hostname[2],
+        "Domain:", $cs_domain[2],
         "OS Version:", $os_name[2],
         "OS Architecture:", $os_arch[2],
         "Manufacture:", $cs_manufacturer[2],