mirror of
https://github.com/winapps-org/winapps.git
synced 2025-06-02 13:17:19 +02:00
Revert changes made by pre-commit bot.
This commit is contained in:
parent
d053974995
commit
0102f62a25
83
installer.sh
83
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,27 +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}"
|
||||
|
||||
# Remove the existing '.desktop' file for the application if it exists.
|
||||
$SUDO rm -f "${APP_PATH}/${1}.desktop"
|
||||
|
||||
# Remove the existing bash script for the application if it exists.
|
||||
$SUDO rm -f "${BIN_PATH}/${1}"
|
||||
[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
|
||||
@ -1117,6 +1111,7 @@ function waConfigureDetectedApps() {
|
||||
local OPTIONS=() # Stores a list of options presented to the user.
|
||||
local APP_INSTALL="" # Stores the option selected by the user.
|
||||
local SELECTED_APPS=() # Detected applications selected by the user.
|
||||
local APP_DESKTOP_FILE="" # Stores the '.desktop' file used to launch the application.
|
||||
local DLM=$'\x1F' # Unit separator delimiter.
|
||||
|
||||
if [ -f "$DETECTED_FILE_PATH" ]; then
|
||||
@ -1206,23 +1201,21 @@ function waConfigureDetectedApps() {
|
||||
# Create directory to store application icon and information.
|
||||
$SUDO mkdir -p "${APPDATA_PATH}/apps/${EXE_FILENAME}"
|
||||
|
||||
# Write application information to file.
|
||||
echo "\
|
||||
# GNOME shortcut name
|
||||
NAME=\"${NAME}\"
|
||||
# Determine the content of the '.desktop' file for the application.
|
||||
APP_DESKTOP_FILE="\
|
||||
# GNOME Shortcut Name
|
||||
NAME=\"${NAME}\"
|
||||
# Used for Descriptions and Window Class
|
||||
FULL_NAME=\"${NAME}\"
|
||||
# Executable within Windows VM
|
||||
WIN_EXECUTABLE=\"${EXES[$APPNAME]}\"
|
||||
# GNOME Categories
|
||||
CATEGORIES=\"WinApps\"
|
||||
# GNOME MIME Types
|
||||
MIME_TYPES=\"\""
|
||||
|
||||
# Used for descriptions and window class
|
||||
FULL_NAME=\"${NAME}\"
|
||||
|
||||
# The executable inside Windows VM
|
||||
WIN_EXECUTABLE=\"${EXES[$APPNAME]}\"
|
||||
|
||||
# GNOME categories
|
||||
CATEGORIES=\"WinApps\"
|
||||
|
||||
# GNOME mimetypes
|
||||
MIME_TYPES=\"\"
|
||||
" | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/info" &>/dev/null
|
||||
# Store the '.desktop' file for the application.
|
||||
echo "$APP_DESKTOP_FILE" | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/info" &>/dev/null
|
||||
|
||||
# Write application icon to file.
|
||||
echo "${ICONS[$APPNAME]}" | base64 -d | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/icon.ico" &>/dev/null
|
||||
@ -1380,7 +1373,7 @@ function waUninstall() {
|
||||
### SEQUENTIAL LOGIC ###
|
||||
# Welcome the user.
|
||||
echo -e "${BOLD_TEXT}\
|
||||
################################################################################
|
||||
################################################################################
|
||||
# #
|
||||
# WinApps Install Wizard #
|
||||
# #
|
||||
|
Loading…
x
Reference in New Issue
Block a user