Moved ~/.winapps to ~/.config (backwards compatible)

This commit is contained in:
Fmstrat 2020-11-08 09:56:04 -05:00
parent 7b4891cc8b
commit f86d774fa1
2 changed files with 9 additions and 5 deletions

View File

@ -28,7 +28,7 @@ To Do
## Installation
### Creating your WinApps configuration file
You will need to create a `~/.winapps` 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
RDP_USER="MyWindowsUser"
RDP_PASS="MyWindowsPassword"
@ -95,7 +95,7 @@ Installation complete.
```
### Option 2 - I already have an RDP server or VM
If you already have an RDP server or VM, using WinApps is very straight forward. Simply create your `~/.winapps` configuration file, and run:
If you already have an RDP server or VM, using WinApps is very straight forward. Simply create your `~/.config/winapps/winapps.conf` configuration file, and run:
``` bash
$ git clone https://github.com/Fmstrat/winapps.git
$ cd winapps

View File

@ -36,12 +36,16 @@ if [ -z "$(which xfreerdp)" ]; then
exit
fi
if [ ! -f "${HOME}/.winapps" ]; then
echo "You need to create a ~/.winapps configuration. Exiting..."
if [ ! -f "${HOME}/.config/winapps/winapps.conf" ] && [ ! -f "${HOME}/.winapps" ]; then
echo "You need to create a ~/.config/winapps/winapps.conf configuration. Exiting..."
exit
fi
. "${HOME}/.winapps"
if [ -f "${HOME}/.config/winapps/winapps.conf" ]; then
. "${HOME}/.config/winapps/winapps.conf"
else
. "${HOME}/.winapps"
fi
if [ -z "${RDP_IP}" ]; then
if [ -z "$(groups |grep libvirt)" ]; then