a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: all: imp install script logs 

Updates #3579.

Squashed commit of the following:

commit 0fe83fba34dc633281144ae1a8c3e7782f6995aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 21 14:36:04 2021 +0300

    all: imp install script logs
This commit is contained in:
Ainar Garipov 2021-09-21 14:45:59 +03:00
parent 1714a986e3
commit 5f3131c799
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/install.sh
View File

@ -47,7 +47,7 @@ is_little_endian() {
# machine. The required software: # machine. The required software:
# #
# curl # curl
# unzip (macOS) / tar (other unices) # unzip (macOS) / tar (other unixes)
# #
check_required() { check_required() {
required_darwin="unzip" required_darwin="unzip"
@ -426,6 +426,8 @@ download() {
then then
error_exit "cannot download the package from $url into $pkg_name" error_exit "cannot download the package from $url into $pkg_name"
fi fi
log "successfully downloaded $pkg_name"
} }
# Function unpack unpacks the passed archive depending on it's extension. # Function unpack unpacks the passed archive depending on it's extension.
@ -433,7 +435,7 @@ unpack() {
log "unpacking package from $pkg_name into $out_dir" log "unpacking package from $pkg_name into $out_dir"
if ! mkdir -p "$out_dir" if ! mkdir -p "$out_dir"
then then
error_exit "cannot create directory at the $out_dir" error_exit "cannot create directory $out_dir"
fi fi
case "$pkg_ext" case "$pkg_ext"
@ -449,6 +451,8 @@ unpack() {
;; ;;
esac esac
log "successfully unpacked, contents: $( echo; ls -l -A "$out_dir" )"
rm "$pkg_name" rm "$pkg_name"
} }
@ -507,6 +511,8 @@ install_service() {
return 0 return 0
fi fi
log "installation failed, removing $agh_dir"
rm -r "$agh_dir" rm -r "$agh_dir"
# Some devices detected to have armv7 CPU face the compatibility # Some devices detected to have armv7 CPU face the compatibility