Skip to content

Commit

Permalink
fix snap /realpath check #219
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Feb 17, 2020
1 parent 73c350e commit 53d25cc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -1093,10 +1093,10 @@ myrealpath() { # real path of possible symlink
command -v realpath >/dev/null && {
realpath "$@"
} || {
[ -h "$@" ] && warning "Could not check symbolic link.
[ -h "$@" ] && warning "Could not check for symbolic links.
Please install 'realpath' (package 'coreutils'),
or provide real file path instead of symbolic link path.
Symbolic link: $@"
Possible symbolic link: $@"
echo "$@" ### FIXME: Maybe workaround with ls
return 1
}
Expand Down Expand Up @@ -6058,7 +6058,7 @@ check_host() { # check host environment
Hostsystem="$(grep '^ID=' /etc/os-release 2>/dev/null | cut -d= -f2 || echo 'unknown')"

# Check if docker is installed with Ubuntu snap
realpath $(command -v docker) | grep -q snap && Runsinsnap="yes" || Runsinsnap="no"
myrealpath "$(command -v docker)" | grep -q snap && Runsinsnap="yes" || Runsinsnap="no"

# Check libc from host. If same as in container, it is possible to share timezone file
Hostlibc="unknown"
Expand Down

0 comments on commit 53d25cc

Please sign in to comment.