marcel/winapps
1
0
Fork 0
mirror of https://github.com/winapps-org/winapps.git synced 2025-06-04 06:07:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into legacy-docker

Browse Source
This commit is contained in:
LDprg 2024-05-24 18:22:13 +02:00 committed by GitHub
commit fe406087ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
37 changed files with 283 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
README.md
View File

@ -1,5 +1,6 @@
# winapps # winapps
The winapps main project
The winapps main project
Originally created by fmstrat https://github.com/Fmstrat/winapps/ Originally created by fmstrat https://github.com/Fmstrat/winapps/
Run Windows apps such as Microsoft Office/Adobe in Linux (Ubuntu/Fedora) and GNOME/KDE as if they were a part of the native OS, including Nautilus integration for right clicking on files of specific mime types to open them. Run Windows apps such as Microsoft Office/Adobe in Linux (Ubuntu/Fedora) and GNOME/KDE as if they were a part of the native OS, including Nautilus integration for right clicking on files of specific mime types to open them.
@ -7,7 +8,9 @@ Run Windows apps such as Microsoft Office/Adobe in Linux (Ubuntu/Fedora) and GNO
<img src="demo/demo.gif" width=1000> <img src="demo/demo.gif" width=1000>
## How it works ## How it works
WinApps was created as an easy, one command way to include apps running inside a VM (or on any RDP server) directly into GNOME as if they were native applications. WinApps works by: WinApps was created as an easy, one command way to include apps running inside a VM (or on any RDP server) directly into GNOME as if they were native applications. WinApps works by:
- Running a Windows RDP server in a background VM container - Running a Windows RDP server in a background VM container
- Checking the RDP server for installed applications such as Microsoft Office - Checking the RDP server for installed applications such as Microsoft Office
- If those programs are installed, it creates shortcuts leveraging FreeRDP for both the CLI and the GNOME tray - If those programs are installed, it creates shortcuts leveraging FreeRDP for both the CLI and the GNOME tray
@ -15,9 +18,11 @@ WinApps was created as an easy, one command way to include apps running inside a
- You can right click on any files in your home directory to open with an application, too - You can right click on any files in your home directory to open with an application, too
## Currently supported applications ## Currently supported applications
### WinApps supports ***ANY*** installed application on your system.
### WinApps supports **_ANY_** installed application on your system.
It does this by: It does this by:
1. Scanning your system for offically configured applications (below) 1. Scanning your system for offically configured applications (below)
2. Scanning your system for any other EXE files with install records in the Windows Registry 2. Scanning your system for any other EXE files with install records in the Windows Registry
@ -75,16 +80,19 @@ Note: The officially configured application list below is fueled by the communit
## Installation ## Installation
### Step 1: Set up a Windows Virtual Machine ### Step 1: Set up a Windows Virtual Machine
The best solution for running a VM as a subsystem for WinApps would be docker. Docker allows to automise the install process and still uses kvm/qemu under the hood. We still provide the outdated KVM install instructions. The best solution for running a VM as a subsystem for WinApps would be docker. Docker allows to automize the install process and still uses kvm/qemu under the hood. We still provide the outdated KVM install instructions.
To set up the VM for WinApps, follow this guide:
- [Creating a Virtual Machine with docker](docs/docker.md) - [Creating a Virtual Machine with docker](docs/docker.md)
- [Creating a Virtual Machine in KVM (outdated)](docs/KVM.md) - [Creating a Virtual Machine in KVM (outdated)](docs/KVM.md)
If you already have a Virtual Machine or server you wish to use with WinApps, you will need to merge `install/RDPApps.reg` into the VM's Windows Registry. If this VM is in KVM and you want to use auto-IP detection, you will need to name the machine `RDPWindows` (auto-IP detection not supported for non-KVM VMs). Directions for both of these can be found in the guide linked above. If you already have a Virtual Machine or server you wish to use with WinApps, you will need to merge `install/RDPApps.reg` into the VM's Windows Registry.
### Step 2: Download the repo and prerequisites ### Step 2: Download the repo and prerequisites
To get things going, use: To get things going, use:
``` bash
```bash
sudo apt install -y freerdp2-x11 sudo apt install -y freerdp2-x11
git clone https://github.com/winapps-org/winapps.git git clone https://github.com/winapps-org/winapps.git
cd winapps cd winapps
@ -95,8 +103,10 @@ cd winapps
> You can find nightly builds here: https://github.com/FreeRDP/FreeRDP/wiki/Prebuilds > You can find nightly builds here: https://github.com/FreeRDP/FreeRDP/wiki/Prebuilds
### Step 3: Creating your WinApps configuration file ### Step 3: Creating your WinApps configuration file
You will need to create a `~/.config/winapps/winapps.conf` configuration file with the following information in it: You will need to create a `~/.config/winapps/winapps.conf` configuration file with the following information in it:
``` bash
```bash
RDP_USER="MyWindowsUser" RDP_USER="MyWindowsUser"
RDP_PASS="MyWindowsPassword" RDP_PASS="MyWindowsPassword"
#RDP_DOMAIN="MYDOMAIN" #RDP_DOMAIN="MYDOMAIN"
@ -105,10 +115,13 @@ RDP_PASS="MyWindowsPassword"
#RDP_FLAGS="" #RDP_FLAGS=""
#MULTIMON="true" #MULTIMON="true"
#DEBUG="true" #DEBUG="true"
#FREERDP_COMMAND="xfreerdp"
``` ```
The username and password should be a full user account and password, such as the one created when setting up Windows or a domain user. It cannot be a user/PIN combination as those are not valid for RDP access. The username and password should be a full user account and password, such as the one created when setting up Windows or a domain user. It cannot be a user/PIN combination as those are not valid for RDP access.
Options: Options:
- When using a pre-existing non-KVM RDP server, you must use the `RDP_IP` to specify it's location - When using a pre-existing non-KVM RDP server, you must use the `RDP_IP` to specify it's location
- If you are running a VM in KVM with NAT enabled, leave `RDP_IP` commented out and WinApps will auto-detect the right local IP - If you are running a VM in KVM with NAT enabled, leave `RDP_IP` commented out and WinApps will auto-detect the right local IP
- For domain users, you can uncomment and change `RDP_DOMAIN` - For domain users, you can uncomment and change `RDP_DOMAIN`
@ -116,15 +129,20 @@ Options:
- To add flags to the FreeRDP call, such as `/audio-mode:1` to pass in a mic, use the `RDP_FLAGS` configuration option - To add flags to the FreeRDP call, such as `/audio-mode:1` to pass in a mic, use the `RDP_FLAGS` configuration option
- For multi-monitor setups, you can try enabling `MULTIMON`, however if you get a black screen (FreeRDP bug) you will need to revert back - For multi-monitor setups, you can try enabling `MULTIMON`, however if you get a black screen (FreeRDP bug) you will need to revert back
- If you enable `DEBUG`, a log will be created on each application start in `~/.local/share/winapps/winapps.log` - If you enable `DEBUG`, a log will be created on each application start in `~/.local/share/winapps/winapps.log`
- If you are on a system, where the command for freeredp is not xfreerdp, change `FREERDP_COMMAND` to it.
### Step 4: Run the WinApps installer ### Step 4: Run the WinApps installer
Lastly, check that FreeRDP can connect with: Lastly, check that FreeRDP can connect with:
``` ```
bin/winapps check bin/winapps check
``` ```
You will see output from FreeRDP, as well as potentially have to accept the initial certificate. After that, a Windows Explorer window should pop up. You can close this window and press `Ctrl-C` to cancel out of FreeRDP. You will see output from FreeRDP, as well as potentially have to accept the initial certificate. After that, a Windows Explorer window should pop up. You can close this window and press `Ctrl-C` to cancel out of FreeRDP.
If this step fails, try restarting the VM, or your problem could be related to: If this step fails, try restarting the VM, or your problem could be related to:
- You need to accept the security cert the first time you connect (with 'check') - You need to accept the security cert the first time you connect (with 'check')
- Not enabling RDP in the Windows VM - Not enabling RDP in the Windows VM
- Not being able to connect to the IP of the VM - Not being able to connect to the IP of the VM
@ -132,16 +150,19 @@ If this step fails, try restarting the VM, or your problem could be related to:
- Not merging `install/RDPApps.reg` into the VM - Not merging `install/RDPApps.reg` into the VM
Then the final step is to run the installer which will prompt you for a system or user install: Then the final step is to run the installer which will prompt you for a system or user install:
``` bash
```bash
./installer.sh ./installer.sh
``` ```
This will take you through the following process: This will take you through the following process:
<img src="demo/installer.gif" width=1000> <img src="demo/installer.gif" width=1000>
## Adding pre-defined applications ## Adding pre-defined applications
Adding applications with custom icons and mime types to the installer is easy. Simply copy one of the application configurations in the `apps` folder, and: Adding applications with custom icons and mime types to the installer is easy. Simply copy one of the application configurations in the `apps` folder, and:
- Edit the variables for the application - Edit the variables for the application
- Replace the `icon.svg` with an SVG for the application (appropriately licensed) - Replace the `icon.svg` with an SVG for the application (appropriately licensed)
- Re-run the installer - Re-run the installer
@ -150,31 +171,39 @@ Adding applications with custom icons and mime types to the installer is easy. S
When running the installer, it will check for if any configured apps are installed, and if they are it will create the appropriate shortcuts on the host OS. When running the installer, it will check for if any configured apps are installed, and if they are it will create the appropriate shortcuts on the host OS.
## Running applications manually ## Running applications manually
WinApps offers a manual mode for running applications that are not configured. This is completed with the `manual` flag. Executables that are in the path do not require full path definition. WinApps offers a manual mode for running applications that are not configured. This is completed with the `manual` flag. Executables that are in the path do not require full path definition.
``` bash
```bash
./bin/winapps manual "C:\my\directory\executableNotInPath.exe" ./bin/winapps manual "C:\my\directory\executableNotInPath.exe"
./bin/winapps manual executableInPath.exe ./bin/winapps manual executableInPath.exe
``` ```
## Checking for new application support ## Checking for new application support
The installer can be run multiple times, so simply run the below again and it will remove any current installations and update for the latest applications. The installer can be run multiple times, so simply run the below again and it will remove any current installations and update for the latest applications.
``` bash
```bash
./installer.sh ./installer.sh
``` ```
## Optional installer command line arguments ## Optional installer command line arguments
The following optional commands can be used to manage your application configurations without prompts: The following optional commands can be used to manage your application configurations without prompts:
``` bash
```bash
./installer.sh --user # Configure applications for the current user ./installer.sh --user # Configure applications for the current user
./installer.sh --system # Configure applications for the entire system ./installer.sh --system # Configure applications for the entire system
./installer.sh --user --uninstall # Remove all configured applications for the current user ./installer.sh --user --uninstall # Remove all configured applications for the current user
./installer.sh --system --uninstall # Remove all configured applications for the entire system ./installer.sh --system --uninstall # Remove all configured applications for the entire system
./installer.sh --user --setupAllOfficiallySupportedApps # Configures all officially supported applications for the current user
./installer.sh --system --setupAllOfficiallySupportedApps # Configures all officially supported applications for the entire system
``` ```
## Shout outs ## Shout outs
- Some icons pulled from - Some icons pulled from
- Fluent UI React - Icons under [MIT License](https://github.com/Fmstrat/fluent-ui-react/blob/master/LICENSE.md) - Fluent UI React - Icons under [MIT License](https://github.com/Fmstrat/fluent-ui-react/blob/master/LICENSE.md)
- Fluent UI - Icons under [MIT License](https://github.com/Fmstrat/fluentui/blob/master/LICENSE) with [restricted use](https://static2.sharepointonline.com/files/fabric/assets/microsoft_fabric_assets_license_agreement_nov_2019.pdf) - Fluent UI - Icons under [MIT License](https://github.com/Fmstrat/fluentui/blob/master/LICENSE) with [restricted use](https://static2.sharepointonline.com/files/fabric/assets/microsoft_fabric_assets_license_agreement_nov_2019.pdf)
- PKief's VSCode Material Icon Theme - Icons under [MIT License](https://github.com/Fmstrat/vscode-material-icon-theme/blob/master/LICENSE.md) - PKief's VSCode Material Icon Theme - Icons under [MIT License](https://github.com/Fmstrat/vscode-material-icon-theme/blob/master/LICENSE.md)
- DiemenDesign's LibreICONS - Icons under [MIT License](https://github.com/Fmstrat/LibreICONS/blob/master/LICENSE) - DiemenDesign's LibreICONS - Icons under [MIT License](https://github.com/Fmstrat/LibreICONS/blob/master/LICENSE)

3
apps/adobe-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="" MIME_TYPES=""
# System Icon
ICON="AdobeUpdate"

3
apps/aftereffects-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.adobe.aftereffects.project;application/vnd.adobe.aftereffects.template;" MIME_TYPES="application/vnd.adobe.aftereffects.project;application/vnd.adobe.aftereffects.template;"
# System Icon
ICON="AdobeAfterEffect"

3
apps/audition-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="" MIME_TYPES=""
# System Icon
ICON="AdobeAudition"

3
apps/bridge-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="image/vnd.adobe.photoshop;" MIME_TYPES="image/vnd.adobe.photoshop;"
# System Icon
ICON="AdobeBridge"

3
apps/bridge-cs6-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="image/vnd.adobe.photoshop;" MIME_TYPES="image/vnd.adobe.photoshop;"
# System Icon
ICON="AdobeBridge"

3
apps/bridge-cs6/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="image/vnd.adobe.photoshop;" MIME_TYPES="image/vnd.adobe.photoshop;"
# System Icon
ICON="AdobeBridge"

3
apps/cmd/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Windows"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="" MIME_TYPES=""
# System Icon
ICON="Terminal"

3
apps/excel-o365-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;" MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
# System Icon
ICON="ms-excel"s

3
apps/excel-o365/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;" MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
# System Icon
ICON="ms-excel"

3
apps/excel-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;" MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
# System Icon
ICON="ms-excel"

3
apps/excel/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;" MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
# System Icon
ICON="ms-excel"

2
apps/iexplorer/info
View File

@ -8,7 +8,7 @@ FULL_NAME="Internet Explorer"
WIN_EXECUTABLE="C:\Program Files\Internet Explorer\iexplore.exe" WIN_EXECUTABLE="C:\Program Files\Internet Explorer\iexplore.exe"
# GNOME categories # GNOME categories
CATEGORIES="WinApps;Office" CATEGORIES="WinApps;Network;WebBrowser;"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;" MIME_TYPES="text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;"

3
apps/illustrator-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/illustrator;" MIME_TYPES="application/illustrator;"
# System Icon
ICON="AdobeIllustrator"

3
apps/indesign-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/x-adobe-indesign-interchange;application/x-adobe-indesign;" MIME_TYPES="application/x-adobe-indesign-interchange;application/x-adobe-indesign;"
# System Icon
ICON="AdobeIndesign"

3
apps/lightroom-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="" MIME_TYPES=""
# System Icon
ICON="AdobeLightroom"

3
apps/onenote-o365-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msonenote;" MIME_TYPES="application/msonenote;"
# System Icon
ICON="ms-outlook"

3
apps/onenote-o365/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msonenote;" MIME_TYPES="application/msonenote;"
# System Icon
ICON="ms-outlook"

3
apps/onenote-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msonenote;" MIME_TYPES="application/msonenote;"
# System Icon
ICON="ms-onenote"

3
apps/onenote/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msonenote;" MIME_TYPES="application/msonenote;"
# System Icon
ICON="ms-outlook"

3
apps/outlook-o365-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;" MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
# System Icon
ICON="ms-outlook"

3
apps/outlook-o365/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;" MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
# System Icon
ICON="ms-outlook"

3
apps/outlook-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;" MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
# System Icon
ICON="ms-outlook"

3
apps/outlook/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;" MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
# System Icon
ICON="ms-outlook"

3
apps/photoshop-cc/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="image/vnd.adobe.photoshop;" MIME_TYPES="image/vnd.adobe.photoshop;"
# System Icon
ICON="AdobePhotoshop"

3
apps/photoshop-cs6-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="image/vnd.adobe.photoshop;" MIME_TYPES="image/vnd.adobe.photoshop;"
# System Icon
ICON="AdobePhotoshop"

3
apps/photoshop-cs6/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="image/vnd.adobe.photoshop;" MIME_TYPES="image/vnd.adobe.photoshop;"
# System Icon
ICON="AdobePhotoshop"

3
apps/powerpoint-o365-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;" MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
# System Icon
ICON="ms-powerpoint"

3
apps/powerpoint-o365/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;" MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
# System Icon
ICON="ms-powerpoint"

3
apps/powerpoint-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;" MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
# System Icon
ICON="ms-powerpoint"

3
apps/powerpoint/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;" MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
# System Icon
ICON="ms-powerpoint"

3
apps/word-o365-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;" MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
# System Icon
ICON="ms-word"

3
apps/word-o365/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;" MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
# System Icon
ICON="ms-word"

3
apps/word-x86/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;" MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
# System Icon
ICON="ms-word"

3
apps/word/info
View File

@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;" MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
# System Icon
ICON="ms-word"

49
bin/winapps
View File

@ -4,7 +4,6 @@ if [ ! -f "${HOME}/.config/winapps/winapps.conf" ] && [ ! -f "${HOME}/.winapps"
echo "You need to create a ~/.config/winapps/winapps.conf configuration. Exiting..." echo "You need to create a ~/.config/winapps/winapps.conf configuration. Exiting..."
exit exit
fi fi
DIR="$(dirname "$(readlink -f "$0")")" DIR="$(dirname "$(readlink -f "$0")")"
RUN="$(date)-${RANDOM}" RUN="$(date)-${RANDOM}"
@ -22,7 +21,7 @@ fi
function dprint() { function dprint() {
if [ "${DEBUG}" = "true" ]; then if [ "${DEBUG}" = "true" ]; then
echo "[${RUN}] ${1}" >> "${HOME}/.local/share/winapps/winapps.log" echo "[${RUN}] ${1}" >>"${HOME}/.local/share/winapps/winapps.log"
fi fi
} }
@ -34,74 +33,90 @@ if [ -f "${HOME}/.local/share/winapps/run" ]; then
touch "${HOME}/.local/share/winapps/run" touch "${HOME}/.local/share/winapps/run"
THIS_RUN=$(stat -t -c %Y "${HOME}/.local/share/winapps/run") THIS_RUN=$(stat -t -c %Y "${HOME}/.local/share/winapps/run")
dprint "THIS_RUN:${THIS_RUN}" dprint "THIS_RUN:${THIS_RUN}"
if (( $THIS_RUN - $LAST_RAN < 2 )); then if ((THIS_RUN - LAST_RAN < 2)); then
exit exit
fi fi
else else
touch "${HOME}/.local/share/winapps/run" touch "${HOME}/.local/share/winapps/run"
fi fi
if [ -z "$(which xfreerdp)" ]; then if [ -z "${FREERDP_COMMAND}" ]; then
echo "You need xfreerdp!" if command -v xfreerdp &> /dev/null
echo " sudo apt-get install -y freerdp2-x11" then
FREERDP_COMMAND="xfreerdp"
elif command -v xfreerdp3 &> /dev/null
then
FREERDP_COMMAND="xfreerdp3"
fi
elif command -v $FREERDP_COMMAND &> /dev/null
then
dprint "Using custom freerdp command ${FREERDP_COMMAND}"
else
echo "You have supplied a custom FreeRDP command, but the command is not available."
exit exit
fi fi
if [ -z "${RDP_IP}" ]; then if [ -z "${RDP_IP}" ]; then
if [ -z "$(groups |grep libvirt)" ]; then if [ ! "$(groups | grep -v libvirt)" ]; then
echo "You are not a member of the libvirt group. Run the below then reboot." echo "You are not a member of the libvirt group. Run the below then reboot."
echo ' sudo usermod -a -G libvirt $(whoami)' echo ' sudo usermod -a -G libvirt $(whoami)'
echo ' sudo usermod -a -G kvm $(whoami)' echo ' sudo usermod -a -G kvm $(whoami)'
exit exit
fi fi
if [ -z "$(virsh list |grep RDPWindows)" ]; then if [ ! "$(virsh list | grep -v RDPWindows)" ]; then
echo "RDPWindows is not running, run:" echo "RDPWindows is not running, run:"
echo " virsh start RDPWindows" echo " virsh start RDPWindows"
exit exit
fi fi
RDP_IP=$(virsh net-dhcp-leases default |grep RDPWindows |awk '{print $5}') RDP_IP=$(virsh net-dhcp-leases default | grep RDPWindows | awk '{print $5}')
RDP_IP=${RDP_IP%%\/*} RDP_IP=${RDP_IP%%\/*}
fi fi
dprint "1:${1}" dprint "1:${1}"
dprint "2:${2}" dprint "2:${2}"
# this is just for debug logging anyways
# shellcheck disable=SC2145
dprint "@:${@}" dprint "@:${@}"
MULTI_FLAG="span" MULTI_FLAG="+span"
if [ "${MULTIMON}" = "true" ]; then if [ "${MULTIMON}" = "true" ]; then
MULTI_FLAG="multimon" MULTI_FLAG="/multimon"
fi fi
if [ "${1}" = "windows" ]; then if [ "${1}" = "windows" ]; then
xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} /scale:${RDP_SCALE} /dynamic-resolution +auto-reconnect +home-drive /wm-class:"Microsoft Windows" 1> /dev/null 2>&1 & $FREERDP_COMMAND ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /scale:${RDP_SCALE} +dynamic-resolution +auto-reconnect +home-drive /wm-class:"Microsoft Windows" /v:${RDP_IP} 1>/dev/null 2>&1 &
elif [ "${1}" = "check" ]; then elif [ "${1}" = "check" ]; then
dprint "CHECK" dprint "CHECK"
xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /${MULTI_FLAG} /app:"explorer.exe" $FREERDP_COMMAND ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /scale:${RDP_SCALE} +auto-reconnect +home-drive -wallpaper +dynamic-resolution ${MULTI_FLAG} /app:program:"explorer.exe" /v:${RDP_IP}
elif [ "${1}" = "manual" ]; then elif [ "${1}" = "manual" ]; then
dprint "MANUAL:${2}" dprint "MANUAL:${2}"
xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /${MULTI_FLAG} /app:"${2}" 1> /dev/null 2>&1 & $FREERDP_COMMAND ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /scale:${RDP_SCALE} +auto-reconnect +home-drive +dynamic-resolution ${MULTI_FLAG} /app:program:"${2}" /v:"${RDP_IP}" 1>/dev/null 2>&1 &
elif [ "${1}" != "install" ]; then elif [ "${1}" != "install" ]; then
dprint "DIR:${DIR}" dprint "DIR:${DIR}"
if [ -e "${DIR}/../apps/${1}/info" ]; then if [ -e "${DIR}/../apps/${1}/info" ]; then
# shellcheck disable=SC1090
. "${DIR}/../apps/${1}/info" . "${DIR}/../apps/${1}/info"
ICON="${DIR}/../apps/${1}/icon.svg" ICON="${DIR}/../apps/${1}/icon.svg"
elif [ -e "${HOME}/.local/share/winapps/apps/${1}/info" ]; then elif [ -e "${HOME}/.local/share/winapps/apps/${1}/info" ]; then
# shellcheck disable=SC1090
. "${HOME}/.local/share/winapps/apps/${1}/info" . "${HOME}/.local/share/winapps/apps/${1}/info"
ICON="${HOME}/.local/share/winapps/apps/${1}/icon.svg" ICON="${HOME}/.local/share/winapps/apps/${1}/icon.svg"
elif [ -e "/usr/local/share/winapps/apps/${1}/info" ]; then elif [ -e "/usr/local/share/winapps/apps/${1}/info" ]; then
# shellcheck disable=SC1090
. "/usr/local/share/winapps/apps/${1}/info" . "/usr/local/share/winapps/apps/${1}/info"
ICON="/usr/local/share/winapps/apps/${1}/icon.svg" ICON="/usr/local/share/winapps/apps/${1}/icon.svg"
else else
echo "You need to run 'install.sh' first." echo "You need to run 'installer.sh' first."
exit 1 exit 1
fi fi
if [ -n "${2}" ]; then if [ -n "${2}" ]; then
dprint "HOME:${HOME}" dprint "HOME:${HOME}"
FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g') FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g')
dprint "FILE:${FILE}" dprint "FILE:${FILE}"
xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +clipboard +home-drive -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /${MULTI_FLAG} /wm-class:"${FULL_NAME}" /app:"${WIN_EXECUTABLE}" /app-icon:"${ICON}" /app-cmd:"\"${FILE}\"" 1> /dev/null 2>&1 & $FREERDP_COMMAND ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /scale:${RDP_SCALE} +auto-reconnect +clipboard +home-drive -wallpaper +dynamic-resolution ${MULTI_FLAG} /wm-class:"${FULL_NAME}" /app:program:"${WIN_EXECUTABLE}",icon:"${ICON}",name:"${FULL_NAME}",cmd:"\"$FILE\"" /v:"${RDP_IP}" 1>/dev/null 2>&1 &
else else
xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +clipboard +home-drive -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /${MULTI_FLAG} /wm-class:"${FULL_NAME}" /app:"${WIN_EXECUTABLE}" /app-icon:"${ICON}" 1> /dev/null 2>&1 & $FREERDP_COMMAND ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /scale:${RDP_SCALE} +auto-reconnect +clipboard +home-drive -wallpaper +dynamic-resolution ${MULTI_FLAG} /wm-class:"${FULL_NAME}" /app:program:"${WIN_EXECUTABLE}",icon:"${ICON}",name:"${FULL_NAME}" /v:"${RDP_IP}" 1>/dev/null 2>&1 &
fi fi
fi fi

159
installer.sh
View File

@ -1,6 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" if ! command -v bc &> /dev/null
then
echo "You need bc!"
exit
fi
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
MAKEDEMO=0 MAKEDEMO=0
USEDEMO=0 USEDEMO=0
@ -37,16 +43,16 @@ function waFindInstalled() {
cp "${DIR}/install/ExtractPrograms.ps1" ${HOME}/.local/share/winapps/ExtractPrograms.ps1 cp "${DIR}/install/ExtractPrograms.ps1" ${HOME}/.local/share/winapps/ExtractPrograms.ps1
for F in $(ls "${DIR}/apps"); do for F in $(ls "${DIR}/apps"); do
. "${DIR}/apps/${F}/info" . "${DIR}/apps/${F}/info"
echo "IF EXIST \"${WIN_EXECUTABLE}\" ECHO ${F} >> \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp" >> ${HOME}/.local/share/winapps/installed.bat echo "IF EXIST \"${WIN_EXECUTABLE}\" ECHO ${F} >> \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp" >>${HOME}/.local/share/winapps/installed.bat
done; done
echo "powershell.exe -ExecutionPolicy Bypass -File \\\\tsclient\\home\\.local\\share\\winapps\\ExtractPrograms.ps1 > \\\\tsclient\home\\.local\\share\\winapps\\detected" >> ${HOME}/.local/share/winapps/installed.bat echo "powershell.exe -ExecutionPolicy Bypass -File \\\\tsclient\\home\\.local\\share\\winapps\\ExtractPrograms.ps1 > \\\\tsclient\home\\.local\\share\\winapps\\detected" >>${HOME}/.local/share/winapps/installed.bat
echo "RENAME \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp installed" >> ${HOME}/.local/share/winapps/installed.bat echo "RENAME \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp installed" >>${HOME}/.local/share/winapps/installed.bat
xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /span /wm-class:"RDPInstaller" /app:"C:\Windows\System32\cmd.exe" /app-icon:"${DIR}/../icons/windows.svg" /app-cmd:"/C \\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" 1> /dev/null 2>&1 & $FREERDP_COMMAND /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" +auto-reconnect +home-drive -wallpaper +span /app:program:"C:\Windows\System32\cmd.exe",cmd:"/C \\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" /v:${RDP_IP} 1>/dev/null 2>&1 &
COUNT=0 COUNT=0
while [ ! -f "${HOME}/.local/share/winapps/installed" ]; do while [ ! -f "${HOME}/.local/share/winapps/installed" ]; do
sleep 5 sleep 5
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
if (( COUNT == 15 )); then if ((COUNT == 15)); then
echo " Finished." echo " Finished."
echo "" echo ""
echo "The RDP connection failed to connect or run. Please confirm FreeRDP can connect with:" echo "The RDP connection failed to connect or run. Please confirm FreeRDP can connect with:"
@ -75,54 +81,65 @@ function waFindInstalled() {
} }
function waConfigureApp() { function waConfigureApp() {
. "${SYS_PATH}/apps/${1}/info" if [ -z "${ICON}" ]; then
echo -n " Configuring ${NAME}..." ICON=${SYS_PATH}/apps/${1}/icon.${2}
if [ ${USEDEMO} != 1 ]; then fi
${SUDO} rm -f "${APP_PATH}/${1}.desktop"
echo "[Desktop Entry] . "${SYS_PATH}/apps/${1}/info"
echo -n " Configuring ${NAME}..."
if [ ${USEDEMO} != 1 ]; then
${SUDO} rm -f "${APP_PATH}/${1}.desktop"
echo "[Desktop Entry]
Name=${NAME} Name=${NAME}
Exec=${BIN_PATH}/winapps ${1} %F Exec=${BIN_PATH}/winapps ${1} %F
Terminal=false Terminal=false
Type=Application Type=Application
Icon=${SYS_PATH}/apps/${1}/icon.${2} Icon=$ICON
StartupWMClass=${FULL_NAME} StartupWMClass=${FULL_NAME}
Comment=${FULL_NAME} Comment=${FULL_NAME}
Categories=${CATEGORIES} Categories=${CATEGORIES}
MimeType=${MIME_TYPES} MimeType=${MIME_TYPES}
" |${SUDO} tee "${APP_PATH}/${1}.desktop" > /dev/null " | ${SUDO} tee "${APP_PATH}/${1}.desktop" >/dev/null
${SUDO} rm -f "${BIN_PATH}/${1}" ${SUDO} rm -f "${BIN_PATH}/${1}"
echo "#!/usr/bin/env bash echo "#!/usr/bin/env bash
${BIN_PATH}/winapps ${1} $@ ${BIN_PATH}/winapps ${1} $@
" |${SUDO} tee "${BIN_PATH}/${1}" > /dev/null " | ${SUDO} tee "${BIN_PATH}/${1}" >/dev/null
${SUDO} chmod a+x "${BIN_PATH}/${1}" ${SUDO} chmod a+x "${BIN_PATH}/${1}"
fi fi
echo " Finished." echo " Finished."
ICON=""
} }
function waConfigureApps() { function waConfigureApps() {
APPS=() APPS=()
for F in $(cat "${HOME}/.local/share/winapps/installed" |sed 's/\r/\n/g'); do for F in $(cat "${HOME}/.local/share/winapps/installed" | sed 's/\r/\n/g'); do
. "${DIR}/apps/${F}/info" . "${DIR}/apps/${F}/info"
APPS+=("${FULL_NAME} (${F})") APPS+=("${FULL_NAME} (${F})")
INSTALLED_EXES+=("$(echo "${WIN_EXECUTABLE##*\\}" |tr '[:upper:]' '[:lower:]')") INSTALLED_EXES+=("$(echo "${WIN_EXECUTABLE##*\\}" | tr '[:upper:]' '[:lower:]')")
done done
IFS=$'\n' APPS=($(sort <<<"${APPS[*]}")) IFS=$'\n' APPS=($(sort <<<"${APPS[*]}"))
unset IFS unset IFS
OPTIONS=("Set up all detected pre-configured applications" "Select which pre-configured applications to set up" "Do not set up any pre-configured applications") OPTIONS=("Set up all detected pre-configured applications" "Select which pre-configured applications to set up" "Do not set up any pre-configured applications")
menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications?" "${OPTIONS[@]}"
if [ "${INSTALL_TYPE}" != 'User' ]; then
menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications?" "${OPTIONS[@]}"
else "grep -l -d skip"
menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications? If any web browser is set-up, may be configured as default browser." "${OPTIONS[@]}"
fi
if [ "${APP_INSTALL}" = "Select which pre-configured applications to set up" ]; then if [ "${APP_INSTALL}" = "Select which pre-configured applications to set up" ]; then
checkbox_input "Which pre-configured apps would you like to set up?" APPS SELECTED_APPS checkbox_input "Which pre-configured apps would you like to set up?" APPS SELECTED_APPS
echo "" > "${HOME}/.local/share/winapps/installed" echo "" >"${HOME}/.local/share/winapps/installed"
for F in "${SELECTED_APPS[@]}"; do for F in "${SELECTED_APPS[@]}"; do
APP="${F##*(}" APP="${F##*(}"
APP="${APP%%)}" APP="${APP%%)}"
echo "${APP}" >> "${HOME}/.local/share/winapps/installed" echo "${APP}" >>"${HOME}/.local/share/winapps/installed"
done done
fi fi
${SUDO} cp "${DIR}/bin/winapps" "${BIN_PATH}/winapps" ${SUDO} cp "${DIR}/bin/winapps" "${BIN_PATH}/winapps"
COUNT=0 COUNT=0
if [ "${APP_INSTALL}" != "Do not set up any pre-configured applications" ]; then if [ "${APP_INSTALL}" != "Do not set up any pre-configured applications" ]; then
for F in $(cat "${HOME}/.local/share/winapps/installed" |sed 's/\r/\n/g'); do for F in $(cat "${HOME}/.local/share/winapps/installed" | sed 's/\r/\n/g'); do
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
${SUDO} cp -r "apps/${F}" "${SYS_PATH}/apps" ${SUDO} cp -r "apps/${F}" "${SYS_PATH}/apps"
waConfigureApp "${F}" svg waConfigureApp "${F}" svg
@ -130,7 +147,22 @@ function waConfigureApps() {
fi fi
rm -f "${HOME}/.local/share/winapps/installed" rm -f "${HOME}/.local/share/winapps/installed"
rm -f "${HOME}/.local/share/winapps/installed.bat" rm -f "${HOME}/.local/share/winapps/installed.bat"
if (( $COUNT == 0 )); then if (($COUNT == 0)); then
echo " No configured applications."
fi
}
function waConfigureAppsAllOfficiallySupported(){
${SUDO} cp "${DIR}/bin/winapps" "${BIN_PATH}/winapps"
COUNT=0
for F in $(cat "${HOME}/.local/share/winapps/installed" | sed 's/\r/\n/g'); do
COUNT=$((COUNT + 1))
${SUDO} cp -r "apps/${F}" "${SYS_PATH}/apps"
waConfigureApp "${F}" svg
done
rm -f "${HOME}/.local/share/winapps/installed"
rm -f "${HOME}/.local/share/winapps/installed.bat"
if (($COUNT == 0)); then
echo " No configured applications." echo " No configured applications."
fi fi
} }
@ -142,8 +174,12 @@ function waConfigureDetectedApps() {
APPS=() APPS=()
for I in "${!NAMES[@]}"; do for I in "${!NAMES[@]}"; do
EXE=${EXES[$I]##*\\} EXE=${EXES[$I]##*\\}
EXE_LOWER=$(echo "${EXE}" |tr '[:upper:]' '[:lower:]') EXE_LOWER=$(echo "${EXE}" | tr '[:upper:]' '[:lower:]')
if ( dlm=$'\x1F' ; IFS="$dlm" ; [[ "$dlm${INSTALLED_EXES[*]}$dlm" != *"$dlm${EXE_LOWER}$dlm"* ]] ) ; then if (
dlm=$'\x1F'
IFS="$dlm"
[[ "$dlm${INSTALLED_EXES[*]}$dlm" != *"$dlm${EXE_LOWER}$dlm"* ]]
); then
APPS+=("${NAMES[$I]} (${EXE})") APPS+=("${NAMES[$I]} (${EXE})")
fi fi
done done
@ -153,17 +189,17 @@ function waConfigureDetectedApps() {
menuFromArr APP_INSTALL "How would you like to handle other detected applications?" "${OPTIONS[@]}" menuFromArr APP_INSTALL "How would you like to handle other detected applications?" "${OPTIONS[@]}"
if [ "${APP_INSTALL}" = "Select which applications to set up" ]; then if [ "${APP_INSTALL}" = "Select which applications to set up" ]; then
checkbox_input "Which other apps would you like to set up?" APPS SELECTED_APPS checkbox_input "Which other apps would you like to set up?" APPS SELECTED_APPS
echo "" > "${HOME}/.local/share/winapps/installed" echo "" >"${HOME}/.local/share/winapps/installed"
for F in "${SELECTED_APPS[@]}"; do for F in "${SELECTED_APPS[@]}"; do
EXE="${F##*(}" EXE="${F##*(}"
EXE="${EXE%%)}" EXE="${EXE%%)}"
APP="${F% (*}" APP="${F% (*}"
echo "${EXE}|${APP}" >> "${HOME}/.local/share/winapps/installed" echo "${EXE}|${APP}" >>"${HOME}/.local/share/winapps/installed"
done done
elif [ "${APP_INSTALL}" = "Set up all detected applications" ]; then elif [ "${APP_INSTALL}" = "Set up all detected applications" ]; then
for I in "${!EXES[@]}"; do for I in "${!EXES[@]}"; do
EXE=${EXES[$I]##*\\} EXE=${EXES[$I]##*\\}
echo "${EXE}|${NAMES[$I]}" >> "${HOME}/.local/share/winapps/installed" echo "${EXE}|${NAMES[$I]}" >>"${HOME}/.local/share/winapps/installed"
done done
fi fi
COUNT=0 COUNT=0
@ -173,7 +209,7 @@ function waConfigureDetectedApps() {
NAME="${LINE#*|}" NAME="${LINE#*|}"
for I in "${!NAMES[@]}"; do for I in "${!NAMES[@]}"; do
if [ "${NAME}" = "${NAMES[$I]}" ] && [[ "${EXES[$I]}" == *"\\${EXE}" ]]; then if [ "${NAME}" = "${NAMES[$I]}" ] && [[ "${EXES[$I]}" == *"\\${EXE}" ]]; then
EXE=$(echo "${EXE}" |tr '[:upper:]' '[:lower:]') EXE=$(echo "${EXE}" | tr '[:upper:]' '[:lower:]')
${SUDO} mkdir -p "${SYS_PATH}/apps/${EXE}" ${SUDO} mkdir -p "${SYS_PATH}/apps/${EXE}"
echo "# GNOME shortcut name echo "# GNOME shortcut name
NAME=\"${NAME}\" NAME=\"${NAME}\"
@ -189,23 +225,22 @@ CATEGORIES=\"WinApps\"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES=\"\" MIME_TYPES=\"\"
" | sudo tee "${SYS_PATH}/apps/${EXE}/info" > /dev/null " | sudo tee "${SYS_PATH}/apps/${EXE}/info" >/dev/null
echo "${ICONS[$I]}" | base64 -d | sudo tee "${SYS_PATH}/apps/${EXE}/icon.ico" > /dev/null echo "${ICONS[$I]}" | base64 -d | sudo tee "${SYS_PATH}/apps/${EXE}/icon.ico" >/dev/null
waConfigureApp "${EXE}" ico waConfigureApp "${EXE}" ico
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
fi fi
done done
done < "${HOME}/.local/share/winapps/installed" done <"${HOME}/.local/share/winapps/installed"
rm -f "${HOME}/.local/share/winapps/installed" rm -f "${HOME}/.local/share/winapps/installed"
fi fi
rm -f "${HOME}/.local/share/winapps/installed.bat" rm -f "${HOME}/.local/share/winapps/installed.bat"
if (( $COUNT == 0 )); then if (($COUNT == 0)); then
echo " No configured applications." echo " No configured applications."
fi fi
fi fi
} }
function waConfigureWindows() { function waConfigureWindows() {
echo -n " Configuring Windows..." echo -n " Configuring Windows..."
if [ ${USEDEMO} != 1 ]; then if [ ${USEDEMO} != 1 ]; then
@ -218,14 +253,13 @@ Exec=${BIN_PATH}/winapps windows %F
Terminal=false Terminal=false
Type=Application Type=Application
Icon=${SYS_PATH}/icons/windows.svg Icon=${SYS_PATH}/icons/windows.svg
StartupWMClass=Micorosoft Windows StartupWMClass=Microsoft Windows
Comment=Micorosoft Windows Comment=Microsoft Windows
Categories=Windows " | ${SUDO} tee "${APP_PATH}/windows.desktop" >/dev/null
" |${SUDO} tee "${APP_PATH}/windows.desktop" > /dev/null
${SUDO} rm -f "${BIN_PATH}/windows" ${SUDO} rm -f "${BIN_PATH}/windows"
echo "#!/usr/bin/env bash echo "#!/usr/bin/env bash
${BIN_PATH}/winapps windows ${BIN_PATH}/winapps windows
" |${SUDO} tee "/${BIN_PATH}/windows" > /dev/null " | ${SUDO} tee "/${BIN_PATH}/windows" >/dev/null
${SUDO} chmod a+x "${BIN_PATH}/windows" ${SUDO} chmod a+x "${BIN_PATH}/windows"
fi fi
echo " Finished." echo " Finished."
@ -234,12 +268,12 @@ ${BIN_PATH}/winapps windows
function waUninstallUser() { function waUninstallUser() {
rm -f "${HOME}/.local/bin/winapps" rm -f "${HOME}/.local/bin/winapps"
rm -rf "${HOME}/.local/share/winapps" rm -rf "${HOME}/.local/share/winapps"
for F in $(grep -l -d skip "bin/winapps" "${HOME}/.local/share/applications/"*); do for F in $(grep -l -d skip "bin/winapps" "${HOME}/.local/share/applications/"* -s); do
echo -n " Removing ${F}..." echo -n " Removing ${F}..."
${SUDO} rm ${F} ${SUDO} rm ${F}
echo " Finished." echo " Finished."
done done
for F in $(grep -l -d skip "bin/winapps" "${HOME}/.local/bin/"*); do for F in $(grep -l -d skip "bin/winapps" "${HOME}/.local/bin/"* -s); do
echo -n " Removing ${F}..." echo -n " Removing ${F}..."
${SUDO} rm ${F} ${SUDO} rm ${F}
echo " Finished." echo " Finished."
@ -249,7 +283,7 @@ function waUninstallUser() {
function waUninstallSystem() { function waUninstallSystem() {
${SUDO} rm -f "/usr/local/bin/winapps" ${SUDO} rm -f "/usr/local/bin/winapps"
${SUDO} rm -rf "/usr/local/share/winapps" ${SUDO} rm -rf "/usr/local/share/winapps"
for F in $(grep -l -d skip "bin/winapps" "/usr/share/applications/"*); do for F in $(grep -l -d skip "bin/winapps" "/usr/share/applications/"* -s); do
if [ -z "${SUDO}" ]; then if [ -z "${SUDO}" ]; then
waNoSudo waNoSudo
fi fi
@ -257,7 +291,7 @@ function waUninstallSystem() {
${SUDO} rm ${F} ${SUDO} rm ${F}
echo " Finished." echo " Finished."
done done
for F in $(grep -l -d skip "bin/winapps" "/usr/local/bin/"*); do for F in $(grep -l -d skip "bin/winapps" "/usr/local/bin/"* -s); do
if [ -z "${SUDO}" ]; then if [ -z "${SUDO}" ]; then
waNoSudo waNoSudo
fi fi
@ -283,19 +317,32 @@ if [ "${INSTALL_TYPE}" = 'User' ]; then
BIN_PATH="${HOME}/.local/bin" BIN_PATH="${HOME}/.local/bin"
APP_PATH="${HOME}/.local/share/applications" APP_PATH="${HOME}/.local/share/applications"
SYS_PATH="${HOME}/.local/share/winapps" SYS_PATH="${HOME}/.local/share/winapps"
mkdir -p $BIN_PATH
mkdir -p $APP_PATH
mkdir -p $SYS_PATH
if [ -n "${2}" ]; then if [ -n "${2}" ]; then
if [ "${2}" = '--uninstall' ]; then if [ "${2}" = '--uninstall' ]; then
# Uninstall # Uninstall
echo "Uninstalling..." echo "Uninstalling..."
waUninstallUser waUninstallUser
exit exit
elif [ "${2}" = '--setupAllOfficiallySupportedApps' ]; then
echo "Setting up All Officially Supported Apps "
echo "Removing any old configurations..."
waUninstallUser
waUninstallSystem
waInstall
waFindInstalled
waConfigureWindows
waConfigureAppsAllOfficiallySupported
exit
else else
usage usage
fi fi
fi fi
elif [ "${INSTALL_TYPE}" = 'System' ]; then elif [ "${INSTALL_TYPE}" = 'System' ]; then
SUDO="sudo" SUDO="sudo"
sudo ls > /dev/null sudo ls >/dev/null
BIN_PATH="/usr/local/bin" BIN_PATH="/usr/local/bin"
APP_PATH="/usr/share/applications" APP_PATH="/usr/share/applications"
SYS_PATH="/usr/local/share/winapps" SYS_PATH="/usr/local/share/winapps"
@ -305,6 +352,18 @@ elif [ "${INSTALL_TYPE}" = 'System' ]; then
echo "Uninstalling..." echo "Uninstalling..."
waUninstallSystem waUninstallSystem
exit exit
elif [ "${2}" = '--setupAllOfficiallySupportedApps' ]; then
echo "Setting up All Officially Supported Apps "
echo "Removing any old configurations..."
waUninstallUser
waUninstallSystem
echo "Installing..."
waInstall
waFindInstalled
waConfigureWindows
waConfigureAppsAllOfficiallySupported
exit
else else
usage usage
fi fi
@ -330,4 +389,4 @@ waConfigureWindows
waConfigureApps waConfigureApps
waConfigureDetectedApps waConfigureDetectedApps
echo "Installation complete." echo "Installation complete."