Skip to content

install.sh update (fixes) #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+55 −56
Open

install.sh update (fixes) #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 55 additions & 56 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,10 @@ update_config() {

main() {
check_system
sing_box

/usr/sbin/ntpd -q -p 194.190.168.1 -p 216.239.35.0 -p 216.239.35.4 -p 162.159.200.1 -p 162.159.200.123

pkg_list_update || { echo "Packages list update failed"; exit 1; }
pkg_list_update || { msg "Проблема доступности репозиториев, повторите позже или проверьте distfeeds.conf"; exit 1; }

if [ -f "/etc/init.d/podkop" ]; then
msg "Podkop is already installed. Upgraded..."
Expand Down Expand Up @@ -153,12 +152,62 @@ main() {
fi
done

# Check if any files were downloaded
if ! ls "$DOWNLOAD_DIR"/*podkop* >/dev/null 2>&1; then
msg "No packages were downloaded successfully"
msg "Проблема загрузки релиза с GitHub"
exit 1
fi

sing_box

if command -v podkop > /dev/null 2>&1; then
local version
version=$(/usr/bin/podkop show_version 2> /dev/null)
if [ -n "$version" ]; then
version=$(echo "$version" | sed 's/^v//')
local major
local minor
local patch
major=$(echo "$version" | cut -d. -f1)
minor=$(echo "$version" | cut -d. -f2)
patch=$(echo "$version" | cut -d. -f3)

# Compare version: must be >= 0.7.0
if [ "$major" -gt 0 ] ||
[ "$major" -eq 0 ] && [ "$minor" -gt 7 ] ||
[ "$major" -eq 0 ] && [ "$minor" -eq 7 ] && [ "$patch" -ge 0 ]; then
Comment on lines +175 to +177
Copy link

@sorx00 sorx00 Nov 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to rely on the sorting command for version comparing?

min_version="0.7.0"
[ "$(printf '%s\n' "$version" "$min_version" | sort -V | head -1)" = "$min_version" ] && echo OK || echo NOK

Tested with ash from BusyBox v1.36.1.

msg "Podkop version >= 0.7.0"
break
else
msg "Podkop version < 0.7.0"
update_config
fi
else
msg "Unknown podkop version"
update_config
fi
fi

if pkg_is_installed https-dns-proxy; then
msg "Сonflicting package detected: https-dns-proxy. Remove?"

while true; do
read -r -p '' DNSPROXY
case $DNSPROXY in

yes|y|Y)
pkg_remove luci-app-https-dns-proxy
pkg_remove https-dns-proxy
pkg_remove luci-i18n-https-dns-proxy*
break
;;
*)
msg "Exit"
exit 1
;;
esac
done
fi

for pkg in podkop luci-app-podkop; do
file=""
for f in "$DOWNLOAD_DIR"/"$pkg"*; do
Expand Down Expand Up @@ -239,56 +288,6 @@ check_system() {
msg "DNS not working"
exit 1
fi

# Check version
if command -v podkop > /dev/null 2>&1; then
local version
version=$(/usr/bin/podkop show_version 2> /dev/null)
if [ -n "$version" ]; then
version=$(echo "$version" | sed 's/^v//')
local major
local minor
local patch
major=$(echo "$version" | cut -d. -f1)
minor=$(echo "$version" | cut -d. -f2)
patch=$(echo "$version" | cut -d. -f3)

# Compare version: must be >= 0.7.0
if [ "$major" -gt 0 ] ||
[ "$major" -eq 0 ] && [ "$minor" -gt 7 ] ||
[ "$major" -eq 0 ] && [ "$minor" -eq 7 ] && [ "$patch" -ge 0 ]; then
msg "Podkop version >= 0.7.0"
break
else
msg "Podkop version < 0.7.0"
update_config
fi
else
msg "Unknown podkop version"
update_config
fi
fi

if pkg_is_installed https-dns-proxy; then
msg "Сonflicting package detected: https-dns-proxy. Remove?"

while true; do
read -r -p '' DNSPROXY
case $DNSPROXY in

yes|y|Y)
pkg_remove luci-app-https-dns-proxy
pkg_remove https-dns-proxy
pkg_remove luci-i18n-https-dns-proxy*
break
;;
*)
msg "Exit"
exit 1
;;
esac
done
fi
}

sing_box() {
Expand All @@ -303,8 +302,8 @@ sing_box() {
msg "sing-box version $sing_box_version is older than required $required_version"
msg "Removing old version..."
service podkop stop
pkg_remove sing-box
pkg_remove sing-box || { msg "Error removing old sing-box. Halting update."; exit 1; }
fi
}

main
main