marcel/winapps
1
0
Fork 0
mirror of https://github.com/winapps-org/winapps.git synced 2025-06-03 21:57:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes made by pre-commit bot.

Browse Source
This commit is contained in:
Rohan Barar 2024-07-15 11:36:41 +10:00
parent d053974995
commit 0102f62a25
1 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
installer.sh
View File

@ -69,7 +69,7 @@ readonly INQUIRER_PATH="./install/inquirer.sh"
readonly VM_NAME="RDPWindows" # Name of the Windows VM. readonly VM_NAME="RDPWindows" # Name of the Windows VM.
readonly RDP_PORT=3389 # Port used for RDP on the Windows VM. readonly RDP_PORT=3389 # Port used for RDP on the Windows VM.
readonly WINAPPS_CONFIG="\ readonly WINAPPS_CONFIG="\
RDP_USER=\"MyWindowsUser\" RDP_USER=\"MyWindowsUser\"
RDP_PASS=\"MyWindowsPassword\" RDP_PASS=\"MyWindowsPassword\"
#RDP_DOMAIN=\"MYDOMAIN\" #RDP_DOMAIN=\"MYDOMAIN\"
#RDP_IP=\"192.168.123.111\" #RDP_IP=\"192.168.123.111\"
@ -919,16 +919,16 @@ function waConfigureWindows() {
# Populate variables. # Populate variables.
WIN_BASH="\ WIN_BASH="\
#!/usr/bin/env bash #!/usr/bin/env bash
${BIN_PATH}/winapps windows" ${BIN_PATH}/winapps windows"
WIN_DESKTOP="\ WIN_DESKTOP="\
[Desktop Entry] [Desktop Entry]
Name=Windows Name=Windows
Exec=${BIN_PATH}/winapps windows %F Exec=${BIN_PATH}/winapps windows %F
Terminal=false Terminal=false
Type=Application Type=Application
Icon=${APPDATA_PATH}/icons/windows.svg Icon=${APPDATA_PATH}/icons/windows.svg
StartupWMClass=Microsoft Windows StartupWMClass=Microsoft Windows
Comment=Microsoft Windows VM" Comment=Microsoft Windows VM"
# Copy the 'Windows' icon. # Copy the 'Windows' icon.
$SUDO cp "./icons/windows.svg" "${APPDATA_PATH}/icons/windows.svg" $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. # Determine the content of the bash script for the application.
APP_BASH="\ APP_BASH="\
#!/usr/bin/env bash #!/usr/bin/env bash
${BIN_PATH}/winapps ${1}" ${BIN_PATH}/winapps ${1}"
# Determine the content of the '.desktop' file for the application. # Determine the content of the '.desktop' file for the application.
APP_DESKTOP_FILE="\ APP_DESKTOP_FILE="\
[Desktop Entry] [Desktop Entry]
Name=${NAME} Name=${NAME}
Exec=${BIN_PATH}/winapps ${1} %F Exec=${BIN_PATH}/winapps ${1} %F
Terminal=false Terminal=false
Type=Application Type=Application
Icon=${APP_ICON} Icon=${APP_ICON}
StartupWMClass=${FULL_NAME} StartupWMClass=${FULL_NAME}
Comment=${FULL_NAME} Comment=${FULL_NAME}
Categories=${CATEGORIES} Categories=${CATEGORIES}
MimeType=${MIME_TYPES}" 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}"
# Store the '.desktop' file for the application. # Store the '.desktop' file for the application.
echo "$APP_DESKTOP_FILE" | $SUDO tee "${APP_PATH}/${1}.desktop" &>/dev/null 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 OPTIONS=() # Stores a list of options presented to the user.
local APP_INSTALL="" # Stores the option selected by the user. local APP_INSTALL="" # Stores the option selected by the user.
local SELECTED_APPS=() # Detected applications 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. local DLM=$'\x1F' # Unit separator delimiter.
if [ -f "$DETECTED_FILE_PATH" ]; then if [ -f "$DETECTED_FILE_PATH" ]; then
@ -1206,23 +1201,21 @@ function waConfigureDetectedApps() {
# Create directory to store application icon and information. # Create directory to store application icon and information.
$SUDO mkdir -p "${APPDATA_PATH}/apps/${EXE_FILENAME}" $SUDO mkdir -p "${APPDATA_PATH}/apps/${EXE_FILENAME}"
# Write application information to file. # Determine the content of the '.desktop' file for the application.
echo "\ APP_DESKTOP_FILE="\
# GNOME shortcut name # GNOME Shortcut Name
NAME=\"${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 # Store the '.desktop' file for the application.
FULL_NAME=\"${NAME}\" echo "$APP_DESKTOP_FILE" | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/info" &>/dev/null
# 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
# Write application icon to file. # Write application icon to file.
echo "${ICONS[$APPNAME]}" | base64 -d | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/icon.ico" &>/dev/null echo "${ICONS[$APPNAME]}" | base64 -d | $SUDO tee "${APPDATA_PATH}/apps/${EXE_FILENAME}/icon.ico" &>/dev/null
@ -1380,7 +1373,7 @@ function waUninstall() {
### SEQUENTIAL LOGIC ### ### SEQUENTIAL LOGIC ###
# Welcome the user. # Welcome the user.
echo -e "${BOLD_TEXT}\ echo -e "${BOLD_TEXT}\
################################################################################ ################################################################################
# # # #
# WinApps Install Wizard # # WinApps Install Wizard #
# # # #