Skip to content

Commit fa6b7a0

Browse files
Update install.sh
1 parent 27f903e commit fa6b7a0

1 file changed

Lines changed: 45 additions & 4 deletions

File tree

scripts/release/install.sh

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ unpack() {
395395
remove_downloaded_package
396396
log "Package has been unpacked successfully"
397397

398-
base_name=$(basename "$pkg_name")
398+
base_name=$(echo "$pkg_name" | sed -E 's!.*/!!')
399399
dir_name=$(echo "${base_name}" | sed -E -e 's/(.*)(\.tar\.gz|\.zip)/\1/')
400400
# dir_name=$(echo "${pkg_name}" | sed -E -e 's/(.*)(\.tar\.gz|\.zip)/\1/')
401401
if [ -z "${dir_name}" ]; then
@@ -488,8 +488,9 @@ configure() {
488488
fi
489489

490490
set_is_root
491-
set_cpu
492491
set_os
492+
set_cpu
493+
check_out_dir
493494

494495
pkg_ext='tar.gz'
495496
if [ -n "$archive_path" ]; then
@@ -500,7 +501,6 @@ configure() {
500501
fi
501502

502503
parse_version
503-
check_out_dir
504504

505505
if [ "$os" = 'macos' ]
506506
then
@@ -716,6 +716,46 @@ report_success() {
716716
esac
717717
}
718718

719+
post_install() {
720+
if [ -z "$version" ]; then
721+
src=""
722+
if [ -n "${pkg_name:-}" ]; then
723+
src="$pkg_name"
724+
elif [ -n "${archive_path:-}" ]; then
725+
src="$archive_path"
726+
fi
727+
if [ -n "$src" ]; then
728+
version=$(echo "$src" | sed -nE "s@.*${exe_name}-([0-9]+\.[0-9]+\.[0-9]+).*@\\1@p")
729+
fi
730+
fi
731+
min_major=1
732+
min_minor=6
733+
min_patch=10
734+
735+
v_major=$(echo "$version" | sed -nE 's/^([0-9]+).*$/\1/p')
736+
v_minor=$(echo "$version" | sed -nE 's/^[0-9]+\.([0-9]+).*$/\1/p')
737+
v_patch=$(echo "$version" | sed -nE 's/^[0-9]+\.[0-9]+\.([0-9]+).*$/\1/p')
738+
if [ -z "$v_major" ]; then
739+
return 0
740+
fi
741+
[ -z "$v_minor" ] && v_minor=0
742+
[ -z "$v_patch" ] && v_patch=0
743+
744+
if [ "$v_major" -lt "$min_major" ] || { [ "$v_major" -eq "$min_major" ] && [ "$v_minor" -lt "$min_minor" ]; } || { [ "$v_major" -eq "$min_major" ] && [ "$v_minor" -eq "$min_minor" ] && [ "$v_patch" -lt "$min_patch" ]; } ; then
745+
return 0
746+
fi
747+
748+
local args=""
749+
case "$auto_answer" in
750+
[Yy]) args="-y" ;;
751+
[Nn]) args="-n" ;;
752+
esac
753+
if ! "${output_dir}/${exe_name}" post_install $args; then
754+
echo "Post-installation step failed"
755+
exit 1
756+
fi
757+
}
758+
719759
# Entrypoint
720760

721761
exe_name='adguardvpn-cli'
@@ -724,7 +764,7 @@ channel='release'
724764
verbose='1'
725765
cpu=''
726766
os=''
727-
version='1.5.10'
767+
version='1.6.24'
728768
uninstall='0'
729769
remove_command="rm -f"
730770
symlink_exists='0'
@@ -744,6 +784,7 @@ handle_existing
744784

745785
unpack
746786
create_symlink
787+
post_install
747788
verify_hint
748789

749790
report_success

0 commit comments

Comments
 (0)