8 Commits

Author SHA1 Message Date
3f805bead7 Merge pull request 'Update 'README.md'' (#13) from readme_csharp into master
Reviewed-on: #13
2021-06-29 10:45:37 -04:00
dbe2543217 Update 'README.md'
Update the README.md to reflect the work being done to rewrite the program in c#.
2021-06-29 10:42:33 -04:00
9170d37d0c Update 'quickrun.bat'
quickrun.bat was not resetting the execution policy. This fixes this.
2021-05-05 17:53:14 -04:00
bf11d64feb Merge pull request 'Add domain to the collected information' (#11) from Add_Domain into master
Reviewed-on: #11
2021-04-28 18:15:33 -04:00
4ff0c92217 Add domain to the collected information 2021-04-28 18:12:28 -04:00
93b2bf9180 Merge pull request 'Run from USB' (#9) from USB_run into master
Reviewed-on: #9
2021-04-28 10:19:10 -04:00
9c16227e91 Run from USB 2021-04-28 10:17:30 -04:00
9161568787 Merge pull request 'Add License' (#8) from Add_license into master
Reviewed-on: #8
2021-04-28 09:58:37 -04:00
3 changed files with 28 additions and 7 deletions

View File

@@ -24,6 +24,18 @@ It currently outputs:
## Quick Run ## 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` Copy and past into `CMD`
**[Note:]** must be run from an admin prompt. **[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. 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. Below is a breakout of the Powershell commands run by the Quickrun above.
```powershell ```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") (New-Object System.Net.WebClient).DownloadFile("https://efrick.ddns.net/git/efrick/Sysinfo/raw/branch/master/sysinfo.ps1", "sysinfo.ps1")
.\sysinfo.ps1 -write_output .\sysinfo.ps1 -write_output
rm .\sysinfo.ps1 rm .\sysinfo.ps1
@@ -79,3 +92,11 @@ It will require the ability to run Powershell Scripts which is restricted by def
## Dev Notes ## Dev Notes
Going forward branch master will be write protected. Please do all further work on branches off of master. Going forward branch master will be write protected. Please do all further work on branches off of master.
I will be starting to work on rewriting the main script in C#. This will afford the following advangages:
* An executable. This will have the advange of not having to mess with the Powershell ExecutionPolicy everytime you want to run the scritp.
* The Autorun in the USB_Run.zip file will actually be able to launch the script.
* With it being writin in C# it should be more extensable and somewhat easier to manintain.

View File

@@ -2,8 +2,5 @@ ECHO off
REM Runs the quick run commands form the readme.md 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 https://efrick.ddns.net/git/efrick/Sysinfo/src/branch/master/README.md#quick-run
REM This must be run from an elevated prompt. 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;Set-ExecutionPolicy $current_execution_policy CurrentUser"
del %userprofile%\AppData\Local\Temp\sysinfo.ps1

View File

@@ -57,6 +57,7 @@ function Find-Computer-Info {
#Init array for storing computer's data #Init array for storing computer's data
$computer_info = @("HOSTNAME:", $cs.Name, $computer_info = @("HOSTNAME:", $cs.Name,
"Domain:", $cs.Domain,
"OS Version:", $computer_os_info.Caption, "OS Version:", $computer_os_info.Caption,
"OS Architecture:", $computer_os_info.OSArchitecture, "OS Architecture:", $computer_os_info.OSArchitecture,
"Manufacture:", $cs.manufacturer, "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 { function Find-Computer-Info_7 {
$cs_hostname = wmic computersystem get name $cs_hostname = wmic computersystem get name
$cs_domain = wmic computersystem get Domain
$os_name = wmic os get Caption $os_name = wmic os get Caption
$os_arch = wmic computersystem get SystemType $os_arch = wmic computersystem get SystemType
$cpu_name = wmic cpu get name $cpu_name = wmic cpu get name
@@ -105,6 +107,7 @@ function Find-Computer-Info_7 {
$computer_info_7 = @( $computer_info_7 = @(
"HOSTNAME:", $cs_hostname[2], "HOSTNAME:", $cs_hostname[2],
"Domain:", $cs_domain[2],
"OS Version:", $os_name[2], "OS Version:", $os_name[2],
"OS Architecture:", $os_arch[2], "OS Architecture:", $os_arch[2],
"Manufacture:", $cs_manufacturer[2], "Manufacture:", $cs_manufacturer[2],