diff options
Diffstat (limited to 'prepare-videochat.sh')
| -rwxr-xr-x | prepare-videochat.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/prepare-videochat.sh b/prepare-videochat.sh index 00e4bf8..d15d816 100755 --- a/prepare-videochat.sh +++ b/prepare-videochat.sh @@ -146,8 +146,13 @@ has_kernel_module() { # Checks if module exists in system (but do not loads it) MODULE="$1" if lsmod | grep "$MODULE" >/dev/null 2>/dev/null; then +<<<<<<< HEAD # echo "$MODULE is loaded! So it exists." return 0 +======= + # echo "$MODULE is loaded! Do nothnig." + : +>>>>>>> bluezio-rep/master else # Determining kernel object existence # I do not know why, but using -q in egrep makes it always return 1, so do not use it @@ -180,6 +185,7 @@ confirm() { can_run() { # It's either the path to a file, or the name of an executable in $PATH which "$1" >/dev/null 2>/dev/null +<<<<<<< HEAD } install_package() { @@ -189,6 +195,8 @@ install_package() { elif [ $DIST = "Arch" ]; then error "Please install $1 package" fi +======= +>>>>>>> bluezio-rep/master } start_adb() { |