diff -rcw -x .git winapps.orig/bin/winapps winapps/bin/winapps
*** winapps.orig/bin/winapps	Mon Nov 29 11:18:59 2021
--- winapps/bin/winapps	Thu Dec  2 10:31:22 2021
***************
*** 73,85 ****
  fi
  
  if [ "${1}" = "windows" ]; then
! 	xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} /scale:${RDP_SCALE} /dynamic-resolution +clipboard +auto-reconnect +home-drive /wm-class:"Microsoft Windows" 1> /dev/null 2>&1 &
  elif [ "${1}" = "check" ]; then
  	dprint "CHECK"
! 	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} /app:"explorer.exe"
  elif [ "${1}" = "manual" ]; then
  	dprint "MANUAL:${2}"
! 	xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive +clipboard -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /${MULTI_FLAG} /app:"${2}" 1> /dev/null 2>&1 &
  elif [ "${1}" != "install" ]; then
  	dprint "DIR:${DIR}"
  	if [ -e "${DIR}/../apps/${1}/info" ]; then
--- 73,85 ----
  fi
  
  if [ "${1}" = "windows" ]; then
! 	xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:"${RDP_IP}" +auto-reconnect +clipboard +home-drive /scale:"${RDP_SCALE}" /dynamic-resolution /"${MULTI_FLAG}" /wm-class:"Microsoft Windows" 1> /dev/null 2>&1 &
  elif [ "${1}" = "check" ]; then
  	dprint "CHECK"
! 	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}" /app:"explorer.exe"
  elif [ "${1}" = "manual" ]; then
  	dprint "MANUAL:${2}"
! 	xfreerdp ${RDP_FLAGS} /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:"${RDP_IP}" +auto-reconnect +home-drive +clipboard -wallpaper /scale:"${RDP_SCALE}" /dynamic-resolution /"${MULTI_FLAG}" /app:"${2}" 1> /dev/null 2>&1 &
  elif [ "${1}" != "install" ]; then
  	dprint "DIR:${DIR}"
  	if [ -e "${DIR}/../apps/${1}/info" ]; then
***************
*** 99,107 ****
  		dprint "HOME:${HOME}"
  		FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g')
  		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:"${ICON}" 1> /dev/null 2>&1 &
  	fi
  fi
  
--- 99,107 ----
  		dprint "HOME:${HOME}"
  		FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g')
  		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} /app:"${WIN_EXECUTABLE}" /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} /app:"${WIN_EXECUTABLE}" 1> /dev/null 2>&1 &
  	fi
  fi
  
diff -rcw -x .git winapps.orig/installer.sh winapps/installer.sh
*** winapps.orig/installer.sh	Mon Nov 29 11:18:59 2021
--- winapps/installer.sh	Thu Dec  2 10:31:22 2021
***************
*** 25,30 ****
--- 25,31 ----
  function waInstall() {
  	${SUDO} mkdir -p "${SYS_PATH}/apps"
  	. "${DIR}/bin/winapps" install
+ 	${SUDO} mkdir -p "${BIN_PATH}"
  }
  
  function waFindInstalled() {
***************
*** 41,47 ****
  		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 "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 &
  		COUNT=0
  		while [ ! -f "${HOME}/.local/share/winapps/installed" ]; do
  			sleep 5
--- 42,48 ----
  		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 "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-icon:"${DIR}/../icons/windows.svg" /app:"\\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" 1> /dev/null 2>&1 &
  		COUNT=0
  		while [ ! -f "${HOME}/.local/share/winapps/installed" ]; do
  			sleep 5
***************
*** 293,298 ****
--- 294,301 ----
  			usage
  		fi
  	fi
+ 	echo "Removing any old configurations..."
+ 	waUninstallUser
  elif [ "${INSTALL_TYPE}" = 'System' ]; then
  	SUDO="sudo"
  	sudo ls > /dev/null
***************
*** 309,319 ****
  			usage
  		fi
  	fi
- fi
- 
  echo "Removing any old configurations..."
- waUninstallUser
  waUninstallSystem
  
  echo "Installing..."
  
--- 312,320 ----
  			usage
  		fi
  	fi
  	echo "Removing any old configurations..."
  	waUninstallSystem
+ fi
  
  echo "Installing..."