fix: run as user when specify alternate home volume

Author: scottyhardy

docker-wine

@@ -7,9 +7,9 @@ print_help () {
     echo "OPTIONS:"
     echo "  --local               Use locally built docker-wine image instead of pulling"
     echo "                          image from DockerHub"
-    echo "  --as-root             Run as root"
-    echo "  --as-me               Run using your current username, UID and GID (default"
-    echo "                          when alternate --home value specified)"
+    echo "  --as-root             Start the container as root"
+    echo "  --as-me               Start the container using your current username, UID and"
+    echo "                          GID (default when alternate --home value specified)"
     echo "  --rdp                 Shortcut for --rdp=interactive"
     echo "  --rdp=OPTION          Runs docker-wine container with Remote Desktop Protocol"
     echo "                          server"
@@ -57,9 +57,16 @@ print_help () {
 }
 
 add_run_arg () {
-    local arg="$1"
+    RUN_ARGS+=("$1")
+}
 
-    RUN_ARGS+=("${arg}")
+add_run_args_for_as_me () {
+    USER_HOME="${HOME}"
+    WORKDIR="${USER_HOME}"
+    add_run_arg --env="USER_NAME=$(whoami)"
+    add_run_arg --env="USER_UID=$(id -u)"
+    add_run_arg --env="USER_GID=$(id -g)"
+    add_run_arg --env="USER_HOME=${USER_HOME}"
 }
 
 
@@ -81,15 +88,10 @@ while [ $# -gt 0 ]; do
         ;;
     --as-root)
         add_run_arg --env="RUN_AS_ROOT=yes"
-        WORKDIR="/root"
+        WORKDIR="/"
         ;;
     --as-me)
-        USER_HOME="${HOME}"
-        WORKDIR="${USER_HOME}"
-        add_run_arg --env="USER_NAME=$(whoami)"
-        add_run_arg --env="USER_UID=$(id -u)"
-        add_run_arg --env="USER_GID=$(id -g)"
-        add_run_arg --env="USER_HOME=${USER_HOME}"
+        add_run_args_for_as_me
         ;;
     --rdp)
         USE_RDP_SERVER="interactive"
@@ -106,6 +108,9 @@ while [ $# -gt 0 ]; do
         ;;
     --home-volume=*)
         USER_VOLUME="${1#*=}"
+
+        # Start container as self to prevent unintentionally changing ownership of a user's local filesystem by wineuser
+        add_run_args_for_as_me
         ;;
     --password=*)
         add_run_arg --env="USER_PASSWD=$(openssl passwd -1 "${1#*=}")"
@@ -244,7 +249,7 @@ else
     elif [ "$(uname)" == "Linux" ]; then
 
         # Check for .Xauthority command -v is required for authenticating as the current user on the host's X11 server
-        if [ -z "${XAUTHORITY}" ] && [ -s "${HOME}/.Xauthority" ]; then
+        if [ -z "${XAUTHORITY}" -a -s "${HOME}/.Xauthority" ]; then
             echo "ERROR: No valid .Xauthority file found for X11"
             exit 1
         fi