From deec2641b79e7436994e5d9498674bf369f52fed Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 13:47:42 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- install/inquirer.sh | 44 +++++++++++++++--------------- installer.sh | 66 ++++++++++++++++++++++----------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/install/inquirer.sh b/install/inquirer.sh index 180fa07..0ff8409 100755 --- a/install/inquirer.sh +++ b/install/inquirer.sh @@ -71,20 +71,20 @@ function inqMenu() { # Each option is enclosed in double quotes within the output string. # For example: '"Option 1 " "The Second Option " " Option Number 3 "' SELECTED_OPTIONS_STRING=$(dialog \ ---keep-tite \ ---clear \ ---no-shadow \ ---menu \ -"$DIALOG_TEXT" \ -"$DIALOG_HEIGHT" \ -"$DIALOG_WIDTH" \ -"$OPTION_NUMBER" \ -"${DIALOG_OPTIONS[@]}" \ -2>&1 >/dev/tty) || exit 0 + --keep-tite \ + --clear \ + --no-shadow \ + --menu \ + "$DIALOG_TEXT" \ + "$DIALOG_HEIGHT" \ + "$DIALOG_WIDTH" \ + "$OPTION_NUMBER" \ + "${DIALOG_OPTIONS[@]}" \ + 2>&1 >/dev/tty) || exit 0 # Remove white space added previously. RETURN_STRING=$(echo "$SELECTED_OPTIONS_STRING" | \ - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') # Remove escapes (introduced by 'dialog' if options have parentheses). RETURN_STRING="${RETURN_STRING//\\/}" # ${variable//search/replace} @@ -154,16 +154,16 @@ function inqChkBx() { # Each option is enclosed in double quotes within the output string. # For example: '"Option 1 " "The Second Option " " Option Number 3 "' SELECTED_OPTIONS_STRING=$(dialog \ ---keep-tite \ ---clear \ ---no-shadow \ ---checklist \ -"$DIALOG_TEXT" \ -"$DIALOG_HEIGHT" \ -"$DIALOG_WIDTH" \ -"$OPTION_NUMBER" \ -"${DIALOG_OPTIONS[@]}" \ -2>&1 >/dev/tty) || exit 0 + --keep-tite \ + --clear \ + --no-shadow \ + --checklist \ + "$DIALOG_TEXT" \ + "$DIALOG_HEIGHT" \ + "$DIALOG_WIDTH" \ + "$OPTION_NUMBER" \ + "${DIALOG_OPTIONS[@]}" \ + 2>&1 >/dev/tty) || exit 0 # Convert the output string into an array. # shellcheck disable=SC2001 @@ -178,7 +178,7 @@ function inqChkBx() { # Remove white space added previously. # shellcheck disable=SC2001 RETURN_ARRAY[i]=$(echo "${RETURN_ARRAY[i]}" | \ - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') # Remove escapes (introduced by 'dialog' if options have parentheses). RETURN_ARRAY[i]=${RETURN_ARRAY[i]//\\/} # ${variable//search/replace} diff --git a/installer.sh b/installer.sh index 1e882f9..64f8c22 100755 --- a/installer.sh +++ b/installer.sh @@ -69,7 +69,7 @@ readonly INQUIRER_PATH="./install/inquirer.sh" readonly VM_NAME="RDPWindows" # Name of the Windows VM. readonly RDP_PORT=3389 # Port used for RDP on the Windows VM. readonly WINAPPS_CONFIG="\ -RDP_USER=\"MyWindowsUser\" + RDP_USER=\"MyWindowsUser\" RDP_PASS=\"MyWindowsPassword\" #RDP_DOMAIN=\"MYDOMAIN\" #RDP_IP=\"192.168.123.111\" @@ -919,16 +919,16 @@ function waConfigureWindows() { # Populate variables. WIN_BASH="\ #!/usr/bin/env bash -${BIN_PATH}/winapps windows" + ${BIN_PATH}/winapps windows" WIN_DESKTOP="\ -[Desktop Entry] -Name=Windows -Exec=${BIN_PATH}/winapps windows %F -Terminal=false -Type=Application -Icon=${APPDATA_PATH}/icons/windows.svg -StartupWMClass=Microsoft Windows -Comment=Microsoft Windows VM" + [Desktop Entry] + Name=Windows + Exec=${BIN_PATH}/winapps windows %F + Terminal=false + Type=Application + Icon=${APPDATA_PATH}/icons/windows.svg + StartupWMClass=Microsoft Windows + Comment=Microsoft Windows VM" # Copy the 'Windows' icon. $SUDO cp "./icons/windows.svg" "${APPDATA_PATH}/icons/windows.svg" @@ -969,21 +969,21 @@ function waConfigureApp() { # Determine the content of the bash script for the application. APP_BASH="\ -#!/usr/bin/env bash -${BIN_PATH}/winapps ${1}" + #!/usr/bin/env bash + ${BIN_PATH}/winapps ${1}" # Determine the content of the '.desktop' file for the application. APP_DESKTOP_FILE="\ -[Desktop Entry] -Name=${NAME} -Exec=${BIN_PATH}/winapps ${1} %F -Terminal=false -Type=Application -Icon=${APP_ICON} -StartupWMClass=${FULL_NAME} -Comment=${FULL_NAME} -Categories=${CATEGORIES} -MimeType=${MIME_TYPES}" + [Desktop Entry] + Name=${NAME} + Exec=${BIN_PATH}/winapps ${1} %F + Terminal=false + Type=Application + Icon=${APP_ICON} + StartupWMClass=${FULL_NAME} + Comment=${FULL_NAME} + Categories=${CATEGORIES} + MimeType=${MIME_TYPES}" # Store the '.desktop' file for the application. echo "$APP_DESKTOP_FILE" | $SUDO tee "${APP_PATH}/${1}.desktop" &>/dev/null @@ -1193,16 +1193,16 @@ function waConfigureDetectedApps() { # Determine the content of the '.desktop' file for the application. APP_DESKTOP_FILE="\ -# GNOME Shortcut Name -NAME=\"${PROGRAM_NAME}\" -# Used for Descriptions and Window Class -FULL_NAME=\"${PROGRAM_NAME}\" -# Executable within Windows VM -WIN_EXECUTABLE=\"${EXES[$INDEX]}\" -# GNOME Categories -CATEGORIES=\"WinApps\" -# GNOME MIME Types -MIME_TYPES=\"\"" + # GNOME Shortcut Name + NAME=\"${PROGRAM_NAME}\" + # Used for Descriptions and Window Class + FULL_NAME=\"${PROGRAM_NAME}\" + # Executable within Windows VM + WIN_EXECUTABLE=\"${EXES[$INDEX]}\" + # GNOME Categories + CATEGORIES=\"WinApps\" + # GNOME MIME Types + MIME_TYPES=\"\"" # Store the '.desktop' file for the application. echo "$APP_DESKTOP_FILE" | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME_NOEXT}/info" &>/dev/null @@ -1366,7 +1366,7 @@ function waUninstall() { ### SEQUENTIAL LOGIC ### # Welcome the user. echo -e "${BOLD_TEXT}\ -################################################################################ + ################################################################################ # # # WinApps Install Wizard # # #