From 32ad6d755c2d04d3b1192ec59a65a0ff8ad56367 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 27 Jan 2025 19:31:26 +0100 Subject: [PATCH] Remove opkg check in Shadowsocks-libev/rust interface --- .../htdocs/luci-static/resources/shadowsocks-libev.js | 2 ++ .../luci-static/resources/view/shadowsocks-libev/instances.js | 2 ++ .../htdocs/luci-static/resources/shadowsocks-rust.js | 2 ++ .../luci-static/resources/view/shadowsocks-rust/instances.js | 2 ++ 4 files changed, 8 insertions(+) diff --git a/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js b/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js index a6460f68d..e2b72a513 100644 --- a/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js +++ b/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js @@ -230,6 +230,7 @@ return L.Class.extend({ } }); }, + /* option_install_package: function(s, tab) { var bin = s.sectiontype.replace('_', '-'), opkg_package = 'shadowsocks-libev-' + bin, o; @@ -246,6 +247,7 @@ return L.Class.extend({ '?query=' + opkg_package, '_blank', 'noopener'); }; }, + */ parse_uri: function(uri) { var scheme = 'ss://'; if (uri && uri.indexOf(scheme) === 0) { diff --git a/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js b/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js index 0e5d76317..b739d4dcd 100644 --- a/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js +++ b/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js @@ -76,9 +76,11 @@ return L.view.extend({ s.tab('advanced', _('Advanced Settings')); s.taboption('general', form.Value, 'label', _('Label')); s.taboption('general', form.Flag, 'disabled', _('Disable')); + /* if (!res[0]) { ss.option_install_package(s, 'general'); } + */ ss.options_common(s, 'advanced'); if (stype === 'ss_server') { diff --git a/luci-app-shadowsocks-rust/htdocs/luci-static/resources/shadowsocks-rust.js b/luci-app-shadowsocks-rust/htdocs/luci-static/resources/shadowsocks-rust.js index 238cb10bb..76f6303a9 100644 --- a/luci-app-shadowsocks-rust/htdocs/luci-static/resources/shadowsocks-rust.js +++ b/luci-app-shadowsocks-rust/htdocs/luci-static/resources/shadowsocks-rust.js @@ -213,6 +213,7 @@ return L.Class.extend({ } }); }, + /* option_install_package: function(s, tab) { var bin = s.sectiontype.replace('_', '-'), opkg_package = 'shadowsocks-rust-' + bin, o; @@ -229,6 +230,7 @@ return L.Class.extend({ '?query=' + opkg_package, '_blank', 'noopener'); }; }, + */ parse_uri: function(uri) { var scheme = 'ss://'; if (uri && uri.indexOf(scheme) === 0) { diff --git a/luci-app-shadowsocks-rust/htdocs/luci-static/resources/view/shadowsocks-rust/instances.js b/luci-app-shadowsocks-rust/htdocs/luci-static/resources/view/shadowsocks-rust/instances.js index 419eed46f..b4339bd1f 100644 --- a/luci-app-shadowsocks-rust/htdocs/luci-static/resources/view/shadowsocks-rust/instances.js +++ b/luci-app-shadowsocks-rust/htdocs/luci-static/resources/view/shadowsocks-rust/instances.js @@ -76,9 +76,11 @@ return L.view.extend({ s.tab('advanced', _('Advanced Settings')); s.taboption('general', form.Value, 'label', _('Label')); s.taboption('general', form.Flag, 'disabled', _('Disable')); + /* if (!res[0]) { ss.option_install_package(s, 'general'); } + */ ss.options_common(s, 'advanced'); if (stype === 'ss_server') {