diff --git a/bin/winapps b/bin/winapps index 07cff0d..2486ae7 100755 --- a/bin/winapps +++ b/bin/winapps @@ -370,7 +370,9 @@ function waRunCommand() { /v:"$RDP_IP" &>/dev/null & else # Convert path from UNIX to Windows style. - FILE_PATH=$(echo "$2" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g') + FILE_PATH=$(echo "$2" | sed \ + -e 's|'"${HOME}"'|\\\\tsclient\\home|' \ + -e 's|/|\\|g') dprint "UNIX_FILE_PATH: ${2}" dprint "WINDOWS_FILE_PATH: ${FILE_PATH}" diff --git a/docs/libvirt.md b/docs/libvirt.md index 27d2fae..a3aa27f 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -45,12 +45,27 @@ Together, these components form a powerful and flexible virtualization stack, wi > `QEMU Guest Agent` is a helper daemon used to exchange information and commands between host and guest operating systems. > You can read more about `QEMU Guest Agent` [here](https://pve.proxmox.com/wiki/Qemu-guest-agent). -5. Download a [Windows 10](https://www.microsoft.com/software-download/windows10ISO) or [Windows 11](https://www.microsoft.com/software-download/windows11) installation `.ISO` image. +5. Configure rootless `libvirt` and `kvm` by adding your user to groups of the same name. + ``` bash + sudo usermod -a -G kvm $(id -un) # Add the user to the 'kvm' group. + sudo usermod -a -G libvirt $(id -un) # Add the user to the 'libvirt' group. + sudo reboot # Reboot the system to ensure the user is added to the relevant groups. + ``` + +6. If relevant to your distribution, disable `AppArmor` for the `libvirt` daemon. + ``` bash + sudo ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/ # Disable AppArmor for the libvirt daemon by creating a symbolic link. + ``` + +> [!NOTE] +> Systems with `SELinux` may also require security policy adjustments if virtual machine images are stored outside the default `/var/lib/libvirt/images` directory. Read [this guide](https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/5/html/virtualization/sect-virtualization-security_for_virtualization-selinux_and_virtualization#sect-Virtualization-Security_for_virtualization-SELinux_and_virtualization) for more information. + +7. Download a [Windows 10](https://www.microsoft.com/software-download/windows10ISO) or [Windows 11](https://www.microsoft.com/software-download/windows11) installation `.ISO` image. > [!IMPORTANT] > 'Professional', 'Enterprise' or 'Server' editions of Windows are required to run RDP applications. Windows 'Home' will NOT suffice. -6. Download [VirtIO drivers](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso) for the Windows virtual machine. +8. Download [VirtIO drivers](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso) for the Windows virtual machine. > [!NOTE] > VirtIO drivers enhance system performance and minimize overhead by enabling the Windows virtual machine to use specialised network and disk device drivers. These drivers are aware that they are operating inside a virtual machine, and cooperate with the hypervisor. This approach eliminates the need for the hypervisor to emulate physical hardware devices, which is a computationally expensive process. This setup allows guests to achieve high-performance network and disk operations, leveraging the benefits of paravirtualisation. @@ -58,11 +73,6 @@ Together, these components form a powerful and flexible virtualization stack, wi > You can read more about `VirtIO` [here](https://wiki.libvirt.org/Virtio.html) and [here](https://developer.ibm.com/articles/l-virtio/). ## Creating a Windows VM -> [!NOTE] -> If you are an expert user, you may wish to: -> - [Define a Windows virtual machine from an existing `.XML` file](#defining-windows-vm-from-xml) -> - [Configure Rootless `libvirt`](#configuring-rootless-libvirt) - 1. Open `virt-manager`. > [!NOTE] @@ -620,7 +630,7 @@ You can then test whether the host GNU/Linux system can communicate with Windows {"return":{"version":"107.0.1","supported_commands":[{"enabled":true,"name":"guest-get-cpustats","success-response":true},{"enabled":true,"name":"guest-get-diskstats","success-response":true},{"enabled":true,"name":"guest-get-devices","success-response":true},{"enabled":true,"name":"guest-get-osinfo","success-response":true},{"enabled":true,"name":"guest-get-timezone","success-response":true},{"enabled":true,"name":"guest-get-users","success-response":true},{"enabled":true,"name":"guest-get-host-name","success-response":true},{"enabled":true,"name":"guest-exec","success-response":true},{"enabled":true,"name":"guest-exec-status","success-response":true},{"enabled":false,"name":"guest-get-memory-block-info","success-response":true},{"enabled":false,"name":"guest-set-memory-blocks","success-response":true},{"enabled":false,"name":"guest-get-memory-blocks","success-response":true},{"enabled":true,"name":"guest-set-user-password","success-response":true},{"enabled":true,"name":"guest-get-fsinfo","success-response":true},{"enabled":true,"name":"guest-get-disks","success-response":true},{"enabled":false,"name":"guest-set-vcpus","success-response":true},{"enabled":true,"name":"guest-get-vcpus","success-response":true},{"enabled":true,"name":"guest-network-get-interfaces","success-response":true},{"enabled":false,"name":"guest-suspend-hybrid","success-response":false},{"enabled":true,"name":"guest-suspend-ram","success-response":false},{"enabled":true,"name":"guest-suspend-disk","success-response":false},{"enabled":true,"name":"guest-fstrim","success-response":true},{"enabled":true,"name":"guest-fsfreeze-thaw","success-response":true},{"enabled":true,"name":"guest-fsfreeze-freeze-list","success-response":true},{"enabled":true,"name":"guest-fsfreeze-freeze","success-response":true},{"enabled":true,"name":"guest-fsfreeze-status","success-response":true},{"enabled":true,"name":"guest-file-flush","success-response":true},{"enabled":true,"name":"guest-file-seek","success-response":true},{"enabled":true,"name":"guest-file-write","success-response":true},{"enabled":true,"name":"guest-file-read","success-response":true},{"enabled":true,"name":"guest-file-close","success-response":true},{"enabled":true,"name":"guest-file-open","success-response":true},{"enabled":true,"name":"guest-shutdown","success-response":false},{"enabled":true,"name":"guest-info","success-response":true},{"enabled":true,"name":"guest-set-time","success-response":true},{"enabled":true,"name":"guest-get-time","success-response":true},{"enabled":true,"name":"guest-ping","success-response":true},{"enabled":true,"name":"guest-sync","success-response":true},{"enabled":true,"name":"guest-sync-delimited","success-response":true}]}} ``` -Next, you will need to make some registry changes to enable RDP Applications to run on the system. Start by downloading the [RDPApps.reg](/install/RDPApps.reg) file, right-clicking on the `Raw` button, and clicking on `Save target as`. +Next, you will need to make some registry changes to enable RDP Applications to run on the system. Start by downloading the [RDPApps.reg](https://github.com/winapps-org/winapps/blob/main/oem/RDPApps.reg) file, right-clicking on the `Raw` button, and clicking on `Save target as`.
@@ -671,36 +681,3 @@ Finally, restart the virtual machine, but **DO NOT** log in. Close the virtual m
```bash
./installer.sh
```
-
-## Expert Installations
-### Defining Windows VM from `.XML`
-This expert guide for `.XML` imports is specific to Ubuntu 20.04 and may not work on all hardware platforms. Please read this guide in conjunction with the steps outlined above.
-
-1. Copy your Windows `.ISO` and `VirtIO` drivers `.ISO` files into the desired folder, updating the relevant paths in `kvm/RDPWindows.xml`.
-
-2. Define a virtual machine called 'RDPWindows' from the sample XML file.
- ``` bash
- virsh define kvm/RDPWindows.xml
- virsh autostart RDPWindows # Configure the VM to start automatically when the host machine boots
- ```
-
-3. Open the virtual machine's properties in `virt-manager` and ensure that `Copy host CPU configuration` is enabled.
-
-4. Boot the virtual machine, install Windows and complete the final configuration steps as outlined in the main guide above.
-
-### Configuring Rootless `libvirt`
-By default, `libvirt` requires sudo to run virtual machines. To enable your user to access `libvirt` and `kvm` without sudo, your user must be added to groups of the same name. Furthermore, modifications need to be made to `AppArmor` (if relevant to your distribution).
-
-``` bash
-sudo sed -i "s/#user = "root"/user = "$(id -un)"/g" /etc/libvirt/qemu.conf # Uncomment the user = "root" line and replace root with the current username.
-sudo sed -i "s/#group = "root"/group = "$(id -gn)"/g" /etc/libvirt/qemu.conf # Uncomment the group = "root" line and replace root with the current user's primary group.
-sudo usermod -a -G kvm $(id -un) # Add the user to the 'kvm' group.
-sudo usermod -a -G libvirt $(id -un) # Add the user to the 'libvirt' group.
-sudo systemctl restart libvirtd # Restart the libvirt daemon.
-sudo ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/ # Disable AppArmor for the libvirt daemon by creating a symbolic link.
-```
-
-You will need to reboot your system to ensure your user is added to the relevant groups.
-
-> [!NOTE]
-> Systems with `SELinux` may also require security policy adjustments to enable correct functioning of the `libvirt` daemon.
diff --git a/docs/libvirt_images/Virtualisation_Stack.svg b/docs/libvirt_images/Virtualisation_Stack.svg
index b522006..9ebb272 100644
--- a/docs/libvirt_images/Virtualisation_Stack.svg
+++ b/docs/libvirt_images/Virtualisation_Stack.svg
@@ -1,180 +1,562 @@
-
diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1
index 16284fd..c014399 100644
--- a/install/ExtractPrograms.ps1
+++ b/install/ExtractPrograms.ps1
@@ -1,153 +1,161 @@
+<#
+'Get-Icon' Source:
+https://github.com/proxb/PowerShell_Scripts/blob/master/Get-Icon.ps1
+
+'Get-Icon' License:
+The MIT License (MIT)
+Copyright (c)
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#>
Function Get-Icon {
<#
- Get-Icon License:
+ .SYNOPSIS
+ Gets the icon from a file
- License
+ .DESCRIPTION
+ Gets the icon from a file and displays it in a variety formats.
- The MIT License (MIT)
+ .PARAMETER Path
+ The path to a file to get the icon
- Copyright (c)
+ .PARAMETER ToBytes
+ Displays outputs as a byte array
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ .PARAMETER ToBitmap
+ Display the icon as a bitmap object
- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ .PARAMETER ToBase64
+ Displays the icon in Base64 encoded format
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #>
- <#
- .SYNOPSIS
- Gets the icon from a file
+ .NOTES
+ Name: Get-Icon
+ Author: Boe Prox
+ Version History:
+ 1.0 //Boe Prox - 11JAN2016
+ - Initial version
- .DESCRIPTION
- Gets the icon from a file and displays it in a variety formats.
+ .OUTPUT
+ System.Drawing.Icon
+ System.Drawing.Bitmap
+ System.String
+ System.Byte[]
- .PARAMETER Path
- The path to a file to get the icon
+ .EXAMPLE
+ Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe'
- .PARAMETER ToBytes
- Displays outputs as a byte array
+ FullName : C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe
+ Handle : 164169893
+ Height : 32
+ Size : {Width=32, Height=32}
+ Width : 32
- .PARAMETER ToBitmap
- Display the icon as a bitmap object
+ Description
+ -----------
+ Returns the System.Drawing.Icon representation of the icon
- .PARAMETER ToBase64
- Displays the icon in Base64 encoded format
+ .EXAMPLE
+ Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBitmap
- .NOTES
- Name: Get-Icon
- Author: Boe Prox
- Version History:
- 1.0 //Boe Prox - 11JAN2016
- - Initial version
+ Tag :
+ PhysicalDimension : {Width=32, Height=32}
+ Size : {Width=32, Height=32}
+ Width : 32
+ Height : 32
+ HorizontalResolution : 96
+ VerticalResolution : 96
+ Flags : 2
+ RawFormat : [ImageFormat: b96b3caa-0728-11d3-9d7b-0000f81ef32e]
+ PixelFormat : Format32bppArgb
+ Palette : System.Drawing.Imaging.ColorPalette
+ FrameDimensionsList : {7462dc86-6180-4c7e-8e3f-ee7333a7a483}
+ PropertyIdList : {}
+ PropertyItems : {}
- .OUTPUT
- System.Drawing.Icon
- System.Drawing.Bitmap
- System.String
- System.Byte[]
+ Description
+ -----------
+ Returns the System.Drawing.Bitmap representation of the icon
- .EXAMPLE
- Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe'
+ .EXAMPLE
+ $FileName = 'C:\Temp\PowerShellIcon.png'
+ $Format = [System.Drawing.Imaging.ImageFormat]::Png
+ (Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBitmap).Save($FileName,$Format)
- FullName : C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe
- Handle : 164169893
- Height : 32
- Size : {Width=32, Height=32}
- Width : 32
+ Description
+ -----------
+ Saves the icon as a file.
- Description
- -----------
- Returns the System.Drawing.Icon representation of the icon
+ .EXAMPLE
+ Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBase64
- .EXAMPLE
- Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBitmap
+ AAABAAEAICAQHQAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP
+ //AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmZmZmZmZmZmZmZgAAAAAAaId3d3d3d4iIiIdgAA
+ AHdmhmZmZmZmZmZmZoZAAAB2ZnZmZmZmZmZmZmZ3YAAAdmZ3ZmiHZniIiHZmaGAAAHZmd2Zv/4eIiIi
+ GZmhgAAB2ZmdmZ4/4eIh3ZmZnYAAAd2ZnZmZo//h2ZmZmZ3YAAHZmaGZmZo//h2ZmZmd2AAB3Zmd2Zm
+ Znj/h2ZmZmhgAAd3dndmZmZuj/+GZmZoYAAHd3dod3dmZuj/9mZmZ2AACHd3aHd3eIiP/4ZmZmd2AAi
+ Hd2iIiIiI//iId2ZndgAIiIhoiIiIj//4iIiIiIYACIiId4iIiP//iIiIiIiGAAiIiIaIiI//+IiIiI
+ iIhkAIiIiGiIiP/4iIiIiIiIdgCIiIhoiIj/iIiIiIiIiIYAiIiIeIiIiIiIiIiIiIiGAAiIiIaP///
+ ////////4hgAAAAAGZmZmZmZmZmZmZmYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////gA
+ AAf4AAAD+AAAAfgAAAHAAAABwAAAAcAAAAHAAAAAwAAAAMAAAADAAAAAwAAAAMAAAABAAAAAQAAAAEA
+ AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAP4AAAH//////////////////////////w==
- Tag :
- PhysicalDimension : {Width=32, Height=32}
- Size : {Width=32, Height=32}
- Width : 32
- Height : 32
- HorizontalResolution : 96
- VerticalResolution : 96
- Flags : 2
- RawFormat : [ImageFormat: b96b3caa-0728-11d3-9d7b-0000f81ef32e]
- PixelFormat : Format32bppArgb
- Palette : System.Drawing.Imaging.ColorPalette
- FrameDimensionsList : {7462dc86-6180-4c7e-8e3f-ee7333a7a483}
- PropertyIdList : {}
- PropertyItems : {}
+ Description
+ -----------
+ Returns the Base64 encoded representation of the icon
- Description
- -----------
- Returns the System.Drawing.Bitmap representation of the icon
+ .EXAMPLE
+ Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBase64 | Clip
- .EXAMPLE
- $FileName = 'C:\Temp\PowerShellIcon.png'
- $Format = [System.Drawing.Imaging.ImageFormat]::Png
- (Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBitmap).Save($FileName,$Format)
+ Description
+ -----------
+ Returns the Base64 encoded representation of the icon and saves it to the clipboard.
- Description
- -----------
- Saves the icon as a file.
+ .EXAMPLE
+ (Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBytes) -Join ''
- .EXAMPLE
- Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBase64
-
- AAABAAEAICAQHQAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP
- //AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmZmZmZmZmZmZmZgAAAAAAaId3d3d3d4iIiIdgAA
- AHdmhmZmZmZmZmZmZoZAAAB2ZnZmZmZmZmZmZmZ3YAAAdmZ3ZmiHZniIiHZmaGAAAHZmd2Zv/4eIiIi
- GZmhgAAB2ZmdmZ4/4eIh3ZmZnYAAAd2ZnZmZo//h2ZmZmZ3YAAHZmaGZmZo//h2ZmZmd2AAB3Zmd2Zm
- Znj/h2ZmZmhgAAd3dndmZmZuj/+GZmZoYAAHd3dod3dmZuj/9mZmZ2AACHd3aHd3eIiP/4ZmZmd2AAi
- Hd2iIiIiI//iId2ZndgAIiIhoiIiIj//4iIiIiIYACIiId4iIiP//iIiIiIiGAAiIiIaIiI//+IiIiI
- iIhkAIiIiGiIiP/4iIiIiIiIdgCIiIhoiIj/iIiIiIiIiIYAiIiIeIiIiIiIiIiIiIiGAAiIiIaP///
- ////////4hgAAAAAGZmZmZmZmZmZmZmYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////gA
- AAf4AAAD+AAAAfgAAAHAAAABwAAAAcAAAAHAAAAAwAAAAMAAAADAAAAAwAAAAMAAAABAAAAAQAAAAEA
- AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAP4AAAH//////////////////////////w==
-
- Description
- -----------
- Returns the Base64 encoded representation of the icon
-
- .EXAMPLE
- Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBase64 | Clip
-
- Description
- -----------
- Returns the Base64 encoded representation of the icon and saves it to the clipboard.
-
- .EXAMPLE
- (Get-Icon -Path 'C:\windows\system32\WindowsPowerShell\v1.0\PowerShell.exe' -ToBytes) -Join ''
-
- 0010103232162900002322002200040000320006400010400000128200000000000000000000000
- 0128001280001281280128000128012801281280012812812801921921920002550025500025525
- 5025500025502550255255002552552550000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000006102102102102102102102102102102960000613611
- 9119119119119120136136136118000119102134102102102102102102102102102134640011810
- 2118102102102102102102102102102119960011810211910210413510212013613611810210496
- 0011810211910211125513513613613613410210496001181021031021031432481201361191021
- 0210396001191021031021021042552481181021021021031180011810210410210210214325513
- 5102102102103118001191021031181021021031432481181021021021340011911910311810210
- 2102232255248102102102134001191191181351191181021101432551021021021180013511911
- 8135119119136136255248102102102119960136119118136136136136143255136135118102119
- 9601361361341361361361362552551361361361361369601361361351201361361432552481361
- 3613613613696013613613610413613625525513613613613613613610001361361361041361362
- 5524813613613613613613611801361361361041361362551361361361361361361361340136136
- 1361201361361361361361361361361361361340813613613414325525525525525525525525524
- 8134000061021021021021021021021021021021020000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000025525525525525525525525525525525525
- 5224003122400152240072240070007000700070003000300030003000300010001000100010000
- 0000000000000000000012800025400125525525525525525525525525525525525525525525525
- 5255255255255
-
- Description
- -----------
- Returns the bytes representation of the icon. -Join was used in this for the sake
- of displaying all of the data.
+ 0010103232162900002322002200040000320006400010400000128200000000000000000000000
+ 0128001280001281280128000128012801281280012812812801921921920002550025500025525
+ 5025500025502550255255002552552550000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000006102102102102102102102102102102960000613611
+ 9119119119119120136136136118000119102134102102102102102102102102102134640011810
+ 2118102102102102102102102102102119960011810211910210413510212013613611810210496
+ 0011810211910211125513513613613613410210496001181021031021031432481201361191021
+ 0210396001191021031021021042552481181021021021031180011810210410210210214325513
+ 5102102102103118001191021031181021021031432481181021021021340011911910311810210
+ 2102232255248102102102134001191191181351191181021101432551021021021180013511911
+ 8135119119136136255248102102102119960136119118136136136136143255136135118102119
+ 9601361361341361361361362552551361361361361369601361361351201361361432552481361
+ 3613613613696013613613610413613625525513613613613613613610001361361361041361362
+ 5524813613613613613613611801361361361041361362551361361361361361361361340136136
+ 1361201361361361361361361361361361361340813613613414325525525525525525525525524
+ 8134000061021021021021021021021021021021020000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000025525525525525525525525525525525525
+ 5224003122400152240072240070007000700070003000300030003000300010001000100010000
+ 0000000000000000000012800025400125525525525525525525525525525525525525525525525
+ 5255255255255
+ Description
+ -----------
+ Returns the bytes representation of the icon. -Join was used in this for the sake
+ of displaying all of the data.
#>
[cmdletbinding(
DefaultParameterSetName = '__DefaultParameterSetName'
@@ -204,23 +212,146 @@ Function Get-Icon {
}
}
+function PrintArrayData {
+ param (
+ [string[]]$Paths,
+ [string]$Source
+ )
+
+ # Remove leading and trailing double quotes from all paths.
+ $Paths = $Paths -replace '^"*|"*$'
+
+ # Sort the array of paths based on the filename at the end of each path.
+ $Paths = $Paths | Sort-Object {
+ # Extract the filename from the path
+ [System.IO.Path]::GetFileName($_)
+ }
+
+ # Loop through the extracted executable file paths.
+ foreach ($exePath in $Paths) {
+ # Get the application name.
+ if ((Get-Item $exePath).VersionInfo.FileDescription) {
+ # Remove leading/trailing whitespace and replace multiple spaces with a single space.
+ $exeName = (Get-Item $exePath).VersionInfo.FileDescription.Trim() -replace '\s+', ' '
+ } else {
+ # Get the executable file name without the file extension.
+ $exeName = [System.IO.Path]::GetFileNameWithoutExtension($exePath)
+ }
+
+ # Remove undesirable suffix for chocolatey shims.
+ if ($Source -eq "choco") {
+ if ($exeName.EndsWith(" - Chocolatey Shim")) {
+ $exeName = $exeName.Substring(0, $exeName.Length - " - Chocolatey Shim".Length)
+ }
+ }
+
+ # Add the appropriate tag to the application name.
+ if ($Source -ne "winreg") {
+ $exeName = $exeName + " [" + $Source + "]"
+ }
+
+ # Store the application icon as a base-64 string.
+ $exeIcon = Get-Icon -Path $exePath -ToBase64
+
+ # Output the results as bash commands that append the results to several bash arrays.
+ "NAMES+=(""$exeName"")"
+ "EXES+=(""$exePath"")"
+ "ICONS+=(""$exeIcon"")"
+ }
+}
+
+function AppSearchWinReg {
+ # Initialise an empty array to store executable paths.
+ $exePaths = @()
+
+ # Query windows registry for unique installed executable files.
+ $exePaths = Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\*" |
+ ForEach-Object { $_."(default)" } | # Extract the value of the (default) property
+ Where-Object { $_ -ne $null } | # Filter out null values
+ Sort-Object -Unique # Ensure uniqueness
+
+ # Process extracted executable file paths.
+ PrintArrayData -Paths $exePaths -Source "winreg"
+}
+
+function AppSearchChocolatey {
+ # Note: This will only look for chocolatey shims!
+ # Initialise an empty array to store executable paths.
+ $exePaths = @()
+
+ # Specify the 'chocolatey' shims directory.
+ $chocoDir = "C:\ProgramData\chocolatey\bin"
+
+ # Check if the 'chocolatey' shims directory exists.
+ if (Test-Path -Path $chocoDir -PathType Container) {
+ # Get all shim '.exe' files.
+ $shimExeFiles = Get-ChildItem -Path $chocoDir -Filter *.exe
+
+ # Loop through each '.shim' file to extract the executable path.
+ foreach ($shimExeFile in $shimExeFiles) {
+ # Resolve the shim to the actual executable path.
+ $exePath = (Get-Command $shimExeFile).Source
+
+ # Add the extracted path to the array.
+ $exePaths += $exePath
+ }
+
+ # Process extracted executable file paths.
+ PrintArrayData -Paths $exePaths -Source "choco"
+ }
+}
+
+function AppSearchScoop {
+ # Initialise an empty array to store executable paths.
+ $exePaths = @()
+
+ # Specify the 'scoop' shims directory.
+ $scoopDir = "$HOME\scoop\shims"
+
+ # Check if the 'scoop' shims directory exists.
+ if (Test-Path -Path $scoopDir -PathType Container) {
+ # Get all '.shim' files.
+ $shimFiles = Get-ChildItem -Path $scoopDir -Filter *.shim
+
+ # Loop through each '.shim' file to extract the executable path.
+ foreach ($shimFile in $shimFiles) {
+ # Read the content of the '.shim' file.
+ $shimFileContent = Get-Content -Path $shimFile.FullName
+
+ # Extract the path using regex, exiting the loop after the first match is found.
+ $exePath = ""
+
+ foreach ($line in $shimFileContent) {
+ # '^\s*path\s*=\s*"([^"]+)"'
+ # ^ --> Asserts the start of the line.
+ # \s* --> Matches any whitespace characters (zero or more times).
+ # path --> Matches the literal string "path".
+ # \s*=\s* --> Matches an equal sign = surrounded by optional whitespace characters.
+ # " --> Matches an initial double quote.
+ # ([^"]+) --> Captures one or more characters that are not ", representing the path inside the double quotes.
+ # " --> Matches a final double quote.
+ if ($line -match '^\s*path\s*=\s*"([^"]+)"') {
+ $exePath = $matches[1]
+ break
+ }
+ }
+
+ # Add the extracted path to the array.
+ $exePaths += $exePath
+ }
+
+ # Process extracted executable file paths.
+ PrintArrayData -Paths $exePaths -Source "scoop"
+ }
+}
+
+### SEQUENTIAL LOGIC ###
+# Print bash commands to define three new arrays.
"NAMES=()"
"ICONS=()"
"EXES=()"
-Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\*" |
- Select-Object -Property "(default)" -Unique |
- Where-Object {$_."(default)" -ne $null} |
- ForEach-Object {
- $Exe = $_."(default)".Trim('"')
- $Item = Get-Item $Exe
- if ($Item.VersionInfo.FileDescription) {
- $Name = $Item.VersionInfo.FileDescription.Trim() -replace " ", " "
- } else {
- $Name = [System.IO.Path]::GetFileNameWithoutExtension($Exe)
- }
- $Icon = Get-Icon -Path $Exe -ToBase64
- #Get-ItemProperty $Exe -Name VersionInfo
- "NAMES+=(""$Name"")"
- "EXES+=(""$Exe"")"
- "ICONS+=(""$Icon"")"
- }
+
+# Search for installed applications.
+AppSearchWinReg
+AppSearchChocolatey
+AppSearchScoop
diff --git a/installer.sh b/installer.sh
index bb2c31b..8d2480c 100755
--- a/installer.sh
+++ b/installer.sh
@@ -594,7 +594,7 @@ function waCheckInstallDependencies() {
return "$EC_MISSING_DEPS"
fi
- # 'libvirt'/'virt-manager' + 'Address Resolution Protocol'.
+ # 'libvirt'/'virt-manager' + 'iproute2'.
if [ "$WAFLAVOR" = "libvirt" ]; then
if ! command -v virsh &>/dev/null; then
# Complete the previous line.
@@ -622,7 +622,7 @@ function waCheckInstallDependencies() {
return "$EC_MISSING_DEPS"
fi
- if ! command -v arp &>/dev/null; then
+ if ! command -v ip &>/dev/null; then
# Complete the previous line.
echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n"
@@ -630,18 +630,18 @@ function waCheckInstallDependencies() {
echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}MISSING DEPENDENCIES.${CLEAR_TEXT}"
# Display the error details.
- echo -e "${INFO_TEXT}Please install 'net-tools' to proceed.${CLEAR_TEXT}"
+ echo -e "${INFO_TEXT}Please install 'iproute2' to proceed.${CLEAR_TEXT}"
# Display the suggested action(s).
echo "--------------------------------------------------------------------------------"
echo "Debian/Ubuntu-based systems:"
- echo -e " ${COMMAND_TEXT}sudo apt install net-tools${CLEAR_TEXT}"
+ echo -e " ${COMMAND_TEXT}sudo apt install iproute2${CLEAR_TEXT}"
echo "Red Hat/Fedora-based systems:"
- echo -e " ${COMMAND_TEXT}sudo dnf install net-tools${CLEAR_TEXT}"
+ echo -e " ${COMMAND_TEXT}sudo dnf install iproute${CLEAR_TEXT}"
echo "Arch Linux systems:"
- echo -e " ${COMMAND_TEXT}sudo pacman -S net-tools${CLEAR_TEXT}"
+ echo -e " ${COMMAND_TEXT}sudo pacman -S iproute2${CLEAR_TEXT}"
echo "Gentoo Linux systems:"
- echo -e " ${COMMAND_TEXT}sudo emerge --ask sys-apps/net-tools${CLEAR_TEXT}"
+ echo -e " ${COMMAND_TEXT}sudo emerge --ask net-misc/iproute2${CLEAR_TEXT}"
echo "--------------------------------------------------------------------------------"
# Terminate the script.
@@ -859,7 +859,7 @@ function waCheckPortOpen() {
# Note: 'RDP_IP' should not be empty if 'WAFLAVOR' is 'docker', since it is set to localhost before this function is called.
if [ -z "$RDP_IP" ] && [ "$WAFLAVOR" = "libvirt" ]; then
VM_MAC=$(virsh domiflist "$VM_NAME" | grep -oE "([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})") # VM MAC address.
- RDP_IP=$(arp -n | grep "$VM_MAC" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}") # VM IP address.
+ RDP_IP=$(ip neigh show | grep "$VM_MAC" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}") # VM IP address.
if [ -z "$RDP_IP" ]; then
# Complete the previous line.
diff --git a/kvm/RDPWindows.qcow2 b/kvm/RDPWindows.qcow2
deleted file mode 100644
index 71211c5..0000000
Binary files a/kvm/RDPWindows.qcow2 and /dev/null differ
diff --git a/kvm/RDPWindows.xml b/kvm/RDPWindows.xml
deleted file mode 100644
index cfd5a08..0000000
--- a/kvm/RDPWindows.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-