diff --git a/installer.sh b/installer.sh index baa5772..12edc50 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}" # Remove the existing '.desktop' file for the application if it exists. $SUDO rm -f "${APP_PATH}/${1}.desktop" @@ -1208,20 +1208,20 @@ function waConfigureDetectedApps() { # Write application information to file. echo "\ -# GNOME shortcut name -NAME=\"${NAME}\" + # GNOME shortcut name + NAME=\"${NAME}\" -# Used for descriptions and window class -FULL_NAME=\"${NAME}\" + # Used for descriptions and window class + FULL_NAME=\"${NAME}\" -# The executable inside Windows VM -WIN_EXECUTABLE=\"${EXES[$APPNAME]}\" + # The executable inside Windows VM + WIN_EXECUTABLE=\"${EXES[$APPNAME]}\" -# GNOME categories -CATEGORIES=\"WinApps\" + # GNOME categories + CATEGORIES=\"WinApps\" -# GNOME mimetypes -MIME_TYPES=\"\" + # GNOME mimetypes + MIME_TYPES=\"\" " | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/info" &>/dev/null # Write application icon to file. @@ -1380,7 +1380,7 @@ function waUninstall() { ### SEQUENTIAL LOGIC ### # Welcome the user. echo -e "${BOLD_TEXT}\ -################################################################################ + ################################################################################ # # # WinApps Install Wizard # # #