Merge branch 'develop' into powershell

README.md

@@ -74,7 +74,7 @@ Note: The app list below is fueled by the community, and therefore many apps may
 ## Installation
 
 ### Step 1: Download the repo and prerequisites
-You will need to store the WinApps repo in a permanent place and not remove it after install. To get things going, use:
+To get things going, use:
 ``` bash
 sudo apt-get install -y freerdp2-x11
 git clone https://github.com/Fmstrat/winapps.git
@@ -160,16 +160,29 @@ 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.
 
-If this step fails, try restarting the VM.
+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')
+- Not enabling RDP in the Windows VM
+- Not being able to connect to the IP of the VM
+- Incorrect user credentials in `~/.config/winapps/winapps.conf`
+- Not merging `install/RDPApps.reg` into the VM
 
-Then the final step is to run the installer:
+Then the final step is to run the installer which will prompt you for a system or user install:
 ``` bash
-$ ./installer.sh --user
+$ ./installer.sh
+? Would you like to install for the current user or the whole system? User
 Removing any old configurations... 
 Installing...
   Checking for installed apps in RDP machine (this may take a while)... Finished.
+  Configuring Acrobat X Pro... Finished.
+  Configuring Bridge CS6... Finished.
+  Configuring Cmd... Finished.
   Configuring Excel... Finished.
+  Configuring Explorer... Finished.
+  Configuring Internet Explorer... Finished.
+  Configuring Photoshop CS6... Finished.
   Configuring PowerPoint... Finished.
+  Configuring Powershell... Finished.
   Configuring Word... Finished.
   Configuring Windows... Finished.
 Installation complete.
@@ -195,7 +208,8 @@ WinApps offers a manual mode for running applications that are not configured. T
 The installer can be run multiple times, so simply run:
 ``` bash
 $ git pull
-$ ./installer.sh --user
+$ ./installer.sh
+? Would you like to install for the current user or the whole system? User
 Removing any old configurations... 
   Removing /home/fmstrat/.local/share/applications/excel.desktop... Finished.
   Removing /home/fmstrat/.local/share/applications/powerpoint.desktop... Finished.
@@ -207,15 +221,22 @@ Removing any old configurations...
   Removing /home/fmstrat/.local/bin/word... Finished.
 Installing...
   Checking for installed apps in RDP machine (this may take a while)... Finished.
+  Configuring Acrobat X Pro... Finished.
+  Configuring Bridge CS6... Finished.
+  Configuring Cmd... Finished.
   Configuring Excel... Finished.
+  Configuring Explorer... Finished.
+  Configuring Internet Explorer... Finished.
+  Configuring Photoshop CS6... Finished.
   Configuring PowerPoint... Finished.
+  Configuring Powershell... Finished.
   Configuring Word... Finished.
   Configuring Windows... Finished.
 Installation complete.
 ```
 
 ## Installer usage
-The following commands can be used to manage your application configurations:
+The following optional commands can be used to manage your application configurations without prompts:
 ``` bash
 ./installer.sh --user                # Configure applications for the current user
 ./installer.sh --system              # Configure applications for the entire system

bin/winapps

@@ -84,17 +84,24 @@ elif [ "${1}" != "install" ]; then
 	dprint "DIR:${DIR}"
 	if [ -e "${DIR}/../apps/${1}/info" ]; then
 		. "${DIR}/../apps/${1}/info"
+		ICON="${DIR}/../apps/${1}/icon.svg"
+	elif [ -e "${HOME}/.local/share/winapps/apps/${1}/info" ]; then
+		. "${HOME}/.local/share/winapps/apps/${1}/info"
+		ICON="${HOME}/.local/share/winapps/apps/${1}/icon.svg"
+	elif [ -e "/usr/local/share/winapps/apps/${1}/info" ]; then
+		. "/usr/local/share/winapps/apps/${1}/info"
+		ICON="/usr/local/share/winapps/apps/${1}/icon.svg"
 	else
 		echo "You need to run 'install.sh' first."
 		exit 1
 	fi
 	if [ -n "${2}" ]; then
 		dprint "HOME:${HOME}"
 		FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g')
-		dprint "FILE:${HOME}"
-		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:"${DIR}/../apps/${1}/icon.svg" /app-cmd:"\"${FILE}\"" 1> /dev/null 2>&1 &
+		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 &
 	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:"${DIR}/../apps/${1}/icon.svg" 1> /dev/null 2>&1 &
+		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 &
 	fi
 fi