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

Merge pull request #158 from KernelGhost/main

Browse Source 
Refactored 'waCheckContainerRunning' in 'installer.sh' to fix #157.
This commit is contained in:
Rohan Barar 2024-07-24 21:54:49 +10:00 committed by GitHub
commit 1a3e2a664a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
installer.sh
View File

@ -72,16 +72,17 @@ readonly INQUIRER_PATH="./install/inquirer.sh" # UNIX path to the 'inquirer' scr
readonly VM_NAME="RDPWindows" # Name of the Windows VM (FOR 'libvirt' ONLY). readonly VM_NAME="RDPWindows" # Name of the Windows VM (FOR 'libvirt' ONLY).
readonly RDP_PORT=3389 # Port used for RDP on Windows. readonly RDP_PORT=3389 # Port used for RDP on Windows.
readonly DOCKER_IP="127.0.0.1" # Localhost. readonly DOCKER_IP="127.0.0.1" # Localhost.
RDP_USER="" readonly WINAPPS_CONFIG="\
RDP_PASS="" RDP_USER=\"MyWindowsUser\"
#RDP_DOMAIN="MYDOMAIN" RDP_PASS=\"MyWindowsPassword\"
#RDP_IP="192.168.123.111" #RDP_DOMAIN=\"MYDOMAIN\"
#WAFLAVOR="docker" # Acceptable values are 'docker', 'podman' and 'libvirt'. #RDP_IP=\"192.168.123.111\"
#WAFLAVOR=\"docker\" # Acceptable values are 'docker', 'podman' and 'libvirt'.
#RDP_SCALE=100 # Acceptable values are 100, 140, and 180. #RDP_SCALE=100 # Acceptable values are 100, 140, and 180.
#RDP_FLAGS="" #RDP_FLAGS=\"\"
#MULTIMON="true" #MULTIMON=\"true\"
#DEBUG="true" #DEBUG=\"true\"
#FREERDP_COMMAND="xfreerdp"' # Default WinApps configuration file content. #FREERDP_COMMAND=\"xfreerdp\""
### GLOBAL VARIABLES ### ### GLOBAL VARIABLES ###
# USER INPUT # USER INPUT
@ -800,34 +801,33 @@ function waCheckVMRunning() {
} }
# Name: 'waCheckContainerRunning' # Name: 'waCheckContainerRunning'
# Role: Throw an error if the Docker container is not running. # Role: Throw an error if the Docker/Podman container is not running.
function waCheckContainerRunning() { function waCheckContainerRunning() {
# Print feedback. # Print feedback.
echo -n "Checking container status... " echo -n "Checking container status... "
# Declare variables. # Declare variables.
local CONTAINER_STATE="" local CONTAINER_STATE=""
local COMPOSE_COMMAND=""
# Determine container state (docker). # Determine the state of the container.
if command -v docker &>/dev/null; then CONTAINER_STATE=$("$WAFLAVOR" ps --all --filter name="WinApps" --format '{{.Status}}')
CONTAINER_STATE=$(docker ps --filter name="WinApps" --format '{{.Status}}')
fi
# Determine container state (podman).
if [ -z "$CONTAINER_STATE" ]; then
CONTAINER_STATE=$(podman ps --filter name="WinApps" --format '{{.Status}}')
fi
CONTAINER_STATE=${CONTAINER_STATE,,} # Convert the string to lowercase. CONTAINER_STATE=${CONTAINER_STATE,,} # Convert the string to lowercase.
CONTAINER_STATE=${CONTAINER_STATE%% *} # Extract the first word. CONTAINER_STATE=${CONTAINER_STATE%% *} # Extract the first word.
# Determine the compose command.
case "$WAFLAVOR" in
"docker") COMPOSE_COMMAND="docker compose" ;;
"podman") COMPOSE_COMMAND="podman-compose" ;;
esac
# Check container state. # Check container state.
if [[ "$CONTAINER_STATE" != "up" ]]; then if [[ "$CONTAINER_STATE" != "up" ]]; then
# Complete the previous line. # Complete the previous line.
echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n" echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n"
# Display the error type. # Display the error type.
echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}DOCKER CONTAINER NOT RUNNING.${CLEAR_TEXT}" echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}CONTAINER NOT RUNNING.${CLEAR_TEXT}"
# Display the error details. # Display the error details.
echo -e "${INFO_TEXT}Windows is not running.${CLEAR_TEXT}" echo -e "${INFO_TEXT}Windows is not running.${CLEAR_TEXT}"
@ -835,7 +835,7 @@ function waCheckContainerRunning() {
# Display the suggested action(s). # Display the suggested action(s).
echo "--------------------------------------------------------------------------------" echo "--------------------------------------------------------------------------------"
echo "Please ensure Windows is powered on:" echo "Please ensure Windows is powered on:"
echo -e "${COMMAND_TEXT}docker compose start${CLEAR_TEXT}" echo -e "${COMMAND_TEXT}${COMPOSE_COMMAND} --file ~/.config/winapps/winapps.conf start${CLEAR_TEXT}"
echo "--------------------------------------------------------------------------------" echo "--------------------------------------------------------------------------------"
# Terminate the script. # Terminate the script.