diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index 634c931..448464e 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -1,5 +1,7 @@ #!/bin/sh +export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH:-}" + CONFIG="owrtremote" SECTION="main" @@ -277,6 +279,21 @@ xray_release_asset() { esac } +install_package() { + local pkg + pkg="$1" + if command -v opkg >/dev/null 2>&1; then + opkg update || die "не смог обновить opkg для установки $pkg" + opkg install "$pkg" || die "не смог поставить $pkg через opkg" + return + fi + if command -v apk >/dev/null 2>&1; then + apk -U add "$pkg" ca-certificates || die "не смог поставить $pkg через apk" + return + fi + die "не найден пакетный менеджер opkg или apk для установки $pkg" +} + install_xray_tmp() { local dir zip asset url version dir="/tmp/owrt-xray" @@ -286,8 +303,7 @@ install_xray_tmp() { mkdir -p /var/lock /var/run "$dir" if ! command -v unzip >/dev/null 2>&1; then - opkg update || die "не смог обновить opkg для установки unzip" - opkg install unzip || die "не смог поставить unzip" + install_package unzip fi printf 'Скачиваю Xray: %s\n' "$asset" diff --git a/install.sh b/install.sh index 5a8bd6e..2b486bd 100644 --- a/install.sh +++ b/install.sh @@ -2,6 +2,8 @@ set -eu +export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH:-}" + RAW_URL="${RAW_URL:-https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main}" ROOT="${ROOT:-/}" SCRIPT_DIR="$(CDPATH= cd "$(dirname "$0")" 2>/dev/null && pwd)" @@ -107,6 +109,31 @@ installed_ui_version() { awk -F '"' '/^OWRT_REMOTE_UI_VERSION=/ { print $2; exit }' "$file" 2>/dev/null || true } +openwrt_version() { + local file + file="$(target_path etc/openwrt_release)" + if [ -r "$file" ]; then + ( + . "$file" 2>/dev/null + printf '%s %s' "${DISTRIB_ID:-OpenWrt}" "${DISTRIB_RELEASE:-unknown}" + ) + return + fi + printf 'OpenWrt unknown' +} + +package_manager() { + if command -v apk >/dev/null 2>&1; then + printf 'apk' + return + fi + if command -v opkg >/dev/null 2>&1; then + printf 'opkg' + return + fi + printf 'unknown' +} + install_file "usr/sbin/owrt-remote" 0755 install_file "etc/init.d/owrt-remote" 0755 install_config @@ -129,8 +156,12 @@ fi key="$(make_key)" ip="$(router_ip)" ui_version="$(installed_ui_version)" +owrt_version="$(openwrt_version)" +pkg_manager="$(package_manager)" info "OpenWrt Remote установлен." +info "OpenWrt: $owrt_version" +info "PKG: $pkg_manager" if [ -n "$ui_version" ]; then info "UI: $ui_version" fi