From 68a7e4f7c546fa654c39835e02a5a166f3240118 Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Tue, 2 Jul 2024 08:24:22 +1000 Subject: [PATCH] Break array declarations across multiple lines to enhance readability. --- bin/winapps | 93 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 83 insertions(+), 10 deletions(-) diff --git a/bin/winapps b/bin/winapps index 6eedc66..228f397 100755 --- a/bin/winapps +++ b/bin/winapps @@ -90,17 +90,58 @@ if [[ -n "$RDP_FLAGS" ]]; then FREERDP_COMMAND="$FREERDP_COMMAND $RDP_FLAGS" fi -if [ "$1" = "windows" ]; then - dprint "WINDOWS" - COMMAND=("${FREERDP_COMMAND}" "/d:${RDP_DOMAIN}" "/u:${RDP_USER}" "/p:${RDP_PASS}" "/scale:${RDP_SCALE}" "+dynamic-resolution" "+auto-reconnect" "+home-drive" "/wm-class:\"Microsoft Windows\"" "/v:${RDP_IP}") - "${COMMAND[@]}" 1>/dev/null 2>&1 & -elif [ "$1" = "check" ]; then +if [ "$1" = "check" ]; then + # Open File Explorer dprint "CHECK" - COMMAND=("${FREERDP_COMMAND}" "/d:${RDP_DOMAIN}" "/u:${RDP_USER}" "/p:${RDP_PASS}" "/scale:${RDP_SCALE}" "+auto-reconnect" "+home-drive" "-wallpaper" "+dynamic-resolution" "${MULTI_FLAG}" "/app:program:explorer.exe" "/v:${RDP_IP}") + COMMAND=( + "${FREERDP_COMMAND}" + "/d:${RDP_DOMAIN}" + "/u:${RDP_USER}" + "/p:${RDP_PASS}" + "/scale:${RDP_SCALE}" + "+auto-reconnect" + "+home-drive" + "-wallpaper" + "+dynamic-resolution" + "${MULTI_FLAG}" + "/app:program:explorer.exe" + "/v:${RDP_IP}" + ) "${COMMAND[@]}" +elif [ "$1" = "windows" ]; then + # Open Virtual Machine + dprint "WINDOWS" + COMMAND=( + "${FREERDP_COMMAND}" + "/d:${RDP_DOMAIN}" + "/u:${RDP_USER}" + "/p:${RDP_PASS}" + "/scale:${RDP_SCALE}" + "+dynamic-resolution" + "+auto-reconnect" + "+home-drive" + "/wm-class:\"Microsoft Windows\"" + "/v:${RDP_IP}" + ) + # Run the command in the background, redirecting both stdout and stderr to /dev/null + "${COMMAND[@]}" 1>/dev/null 2>&1 & elif [ "$1" = "manual" ]; then + # Open Specified Application dprint "MANUAL:${2}" - COMMAND=("${FREERDP_COMMAND}" "/d:${RDP_DOMAIN}" "/u:${RDP_USER}" "/p:${RDP_PASS}" "/scale:${RDP_SCALE}" "+auto-reconnect" "+home-drive" "+dynamic-resolution" "${MULTI_FLAG}" "/app:program:${2}" "/v:${RDP_IP}") + COMMAND=( + "${FREERDP_COMMAND}" + "/d:${RDP_DOMAIN}" + "/u:${RDP_USER}" + "/p:${RDP_PASS}" + "/scale:${RDP_SCALE}" + "+auto-reconnect" + "+home-drive" + "+dynamic-resolution" + "${MULTI_FLAG}" + "/app:program:${2}" + "/v:${RDP_IP}" + ) + # Run the command in the background, redirecting both stdout and stderr to /dev/null "${COMMAND[@]}" 1>/dev/null 2>&1 & elif [ "$1" != "install" ]; then dprint "DIR:${DIR}" @@ -125,10 +166,42 @@ elif [ "$1" != "install" ]; then FILE=$(echo "$2" | sed 's|'"$HOME"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g') dprint "FILE:${FILE}" # shellcheck disable=SC2140 - COMMAND=("${FREERDP_COMMAND}" "/d:${RDP_DOMAIN}" "/u:${RDP_USER}" "/p:${RDP_PASS}" "/scale:${RDP_SCALE}" "+auto-reconnect" "+clipboard" "+home-drive" "-wallpaper" "+dynamic-resolution" "${MULTI_FLAG}" "/wm-class:${FULL_NAME}" "/app:program:${WIN_EXECUTABLE},icon:${ICON},name:${FULL_NAME},cmd:\"${FILE}\"" "/v:${RDP_IP}") - "${COMMAND[@]}" 1>/dev/null 2>&1 & + COMMAND=( + "${FREERDP_COMMAND}" + "/d:${RDP_DOMAIN}" + "/u:${RDP_USER}" + "/p:${RDP_PASS}" + "/scale:${RDP_SCALE}" + "+auto-reconnect" + "+clipboard" + "+home-drive" + "-wallpaper" + "+dynamic-resolution" + "${MULTI_FLAG}" + "/wm-class:${FULL_NAME}" + "/app:program:${WIN_EXECUTABLE},icon:${ICON},name:${FULL_NAME},cmd:\"${FILE}\"" + "/v:${RDP_IP}" + ) + # Run the command in the background, redirecting both stdout and stderr to /dev/null + echo "${COMMAND[@]}" #1>/dev/null 2>&1 & else - COMMAND=("${FREERDP_COMMAND}" "/d:${RDP_DOMAIN}" "/u:${RDP_USER}" "/p:${RDP_PASS}" "/scale:${RDP_SCALE}" "+auto-reconnect" "+clipboard" "+home-drive" "-wallpaper" "+dynamic-resolution" "${MULTI_FLAG}" "/wm-class:${FULL_NAME}" "/app:program:${WIN_EXECUTABLE},icon:${ICON},name:${FULL_NAME}" "/v:${RDP_IP}") + COMMAND=( + "${FREERDP_COMMAND}" + "/d:${RDP_DOMAIN}" + "/u:${RDP_USER}" + "/p:${RDP_PASS}" + "/scale:${RDP_SCALE}" + "+auto-reconnect" + "+clipboard" + "+home-drive" + "-wallpaper" + "+dynamic-resolution" + "${MULTI_FLAG}" + "/wm-class:${FULL_NAME}" + "/app:program:${WIN_EXECUTABLE},icon:${ICON},name:${FULL_NAME}" + "/v:${RDP_IP}" + ) + # Run the command in the background, redirecting both stdout and stderr to /dev/null "${COMMAND[@]}" 1>/dev/null 2>&1 & fi fi