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

Fixed #143

Browse Source
This commit is contained in:
Rohan Barar 2024-07-17 22:15:23 +10:00
parent 0f1788fca9
commit cdd3515179
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/winapps
View File

@ -180,20 +180,25 @@ function waLastRun() {
dprint "THIS_RUN: ${CURR_RUN_UNIX_TIME}" dprint "THIS_RUN: ${CURR_RUN_UNIX_TIME}"
} }
# Name: 'waGetFreeRDPCommand'
# Role: Determine the correct FreeRDP command to use.
function waGetFreeRDPCommand() { function waGetFreeRDPCommand() {
# Declare variables.
local FREERDP_MAJOR_VERSION="" # Stores the major version of the installed copy of FreeRDP.
# Attempt to set a FreeRDP command if the command variable is empty. # Attempt to set a FreeRDP command if the command variable is empty.
if [ -z "$FREERDP_COMMAND" ]; then if [ -z "$FREERDP_COMMAND" ]; then
# Check for 'xfreerdp'. # Check for 'xfreerdp'.
if command -v xfreerdp &>/dev/null; then if command -v xfreerdp &>/dev/null; then
# Check FreeRDP major version is 3 or greater. # Check FreeRDP major version is 3 or greater.
FREERDP_MAJOR_VERSION=$(xfreerdp --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | cut -d'.' -f1) FREERDP_MAJOR_VERSION=$(xfreerdp --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | head -n 1 | cut -d'.' -f1)
if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then
FREERDP_COMMAND="xfreerdp" FREERDP_COMMAND="xfreerdp"
fi fi
# Check for 'xfreerdp3'. # Check for 'xfreerdp3'.
elif command -v xfreerdp3 &>/dev/null; then elif command -v xfreerdp3 &>/dev/null; then
# Check FreeRDP major version is 3 or greater. # Check FreeRDP major version is 3 or greater.
FREERDP_MAJOR_VERSION=$(xfreerdp3 --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | cut -d'.' -f1) FREERDP_MAJOR_VERSION=$(xfreerdp3 --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | head -n 1 | cut -d'.' -f1)
if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then
FREERDP_COMMAND="xfreerdp3" FREERDP_COMMAND="xfreerdp3"
fi fi
@ -270,6 +275,8 @@ function waCheckVMContactable() {
timeout 5 nc -z "$RDP_IP" "$RDP_PORT" &>/dev/null || waThrowExit "$EC_VM_BAD_PORT" timeout 5 nc -z "$RDP_IP" "$RDP_PORT" &>/dev/null || waThrowExit "$EC_VM_BAD_PORT"
} }
# Name: 'waRunCommand'
# Role: Run the requested WinApps command.
function waRunCommand() { function waRunCommand() {
# Declare variables. # Declare variables.
local ICON="" local ICON=""

4
installer.sh
View File

@ -495,13 +495,13 @@ function waCheckDependencies() {
# Check common commands used to launch FreeRDP. # Check common commands used to launch FreeRDP.
if command -v xfreerdp &>/dev/null; then if command -v xfreerdp &>/dev/null; then
# Check FreeRDP major version is 3 or greater. # Check FreeRDP major version is 3 or greater.
FREERDP_MAJOR_VERSION=$(xfreerdp --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | cut -d'.' -f1) FREERDP_MAJOR_VERSION=$(xfreerdp --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | head -n 1 | cut -d'.' -f1)
if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then
FREERDP_COMMAND="xfreerdp" FREERDP_COMMAND="xfreerdp"
fi fi
elif command -v xfreerdp3 &>/dev/null; then elif command -v xfreerdp3 &>/dev/null; then
# Check FreeRDP major version is 3 or greater. # Check FreeRDP major version is 3 or greater.
FREERDP_MAJOR_VERSION=$(xfreerdp3 --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | cut -d'.' -f1) FREERDP_MAJOR_VERSION=$(xfreerdp3 --version | head -n 1 | grep -o -m 1 '\b[0-9]\S*' | head -n 1 | cut -d'.' -f1)
if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then
FREERDP_COMMAND="xfreerdp3" FREERDP_COMMAND="xfreerdp3"
fi fi