Merge pull request #208 from escapefreeg/main

optimize the logic for detecting the FreeRDP command
winapps-org · Aug 22, 2024 · 6381732 · 6381732
2 parents b6f6a93 + b92a427
commit 6381732
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/bin/winapps b/bin/winapps
@@ -250,12 +250,16 @@ function waGetFreeRDPCommand() {
             if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then
                 FREERDP_COMMAND="xfreerdp"
             fi
-        # Check for 'xfreerdp3'.
-        elif command -v xfreerdp3 &>/dev/null; then
-            # Check FreeRDP major version is 3 or greater.
-            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
-                FREERDP_COMMAND="xfreerdp3"
+        fi
+
+        # Check for 'xfreerdp3' command as a fallback option.
+        if [ -z "$FREERDP_COMMAND" ]; then
+            if command -v xfreerdp3 &>/dev/null; then
+                # Check FreeRDP major version is 3 or greater.
+                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
+                    FREERDP_COMMAND="xfreerdp3"
+                fi
             fi
         fi
 

diff --git a/installer.sh b/installer.sh
@@ -548,11 +548,16 @@ function waCheckInstallDependencies() {
             if [[ $FREERDP_MAJOR_VERSION =~ ^[0-9]+$ ]] && ((FREERDP_MAJOR_VERSION >= 3)); then
                 FREERDP_COMMAND="xfreerdp"
             fi
-        elif command -v xfreerdp3 &>/dev/null; then
-            # Check FreeRDP major version is 3 or greater.
-            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
-                FREERDP_COMMAND="xfreerdp3"
+        fi
+
+        # Check for xfreerdp3 command as a fallback option.
+        if [ -z "$FREERDP_COMMAND" ]; then
+            if command -v xfreerdp3 &>/dev/null; then
+                # Check FreeRDP major version is 3 or greater.
+                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
+                    FREERDP_COMMAND="xfreerdp3"
+                fi
             fi
         fi