From af486f5ba33ff56d3df60891f303bdeb9b9f5ac2 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Tue, 2 Jul 2024 21:13:45 +0200
Subject: [PATCH] Remove lua packages from common configs; add lang packages

---
 configs/common/basic       |  5 -----
 configs/common/dumb_ap     |  5 -----
 configs/common/main-router |  5 -----
 configs/common/nss         |  5 -----
 openwrt-configure.sh       | 11 ++++++++---
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/configs/common/basic b/configs/common/basic
index 394d3c5..643620b 100644
--- a/configs/common/basic
+++ b/configs/common/basic
@@ -5,12 +5,7 @@
 
 # LuCI
 CONFIG_PACKAGE_cgi-io=y
-CONFIG_PACKAGE_libiwinfo-lua=y
-CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_liblucihttp=y
-CONFIG_PACKAGE_liblucihttp-lua=y
-CONFIG_PACKAGE_libubus-lua=y
-CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-opkg=y
diff --git a/configs/common/dumb_ap b/configs/common/dumb_ap
index ce0c155..2f1cb0b 100644
--- a/configs/common/dumb_ap
+++ b/configs/common/dumb_ap
@@ -1,11 +1,6 @@
 # LuCI
 CONFIG_PACKAGE_cgi-io=y
-CONFIG_PACKAGE_libiwinfo-lua=y
-CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_liblucihttp=y
-CONFIG_PACKAGE_liblucihttp-lua=y
-CONFIG_PACKAGE_libubus-lua=y
-CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-opkg=y
diff --git a/configs/common/main-router b/configs/common/main-router
index d0f4db3..ff96582 100644
--- a/configs/common/main-router
+++ b/configs/common/main-router
@@ -1,11 +1,6 @@
 # LuCI
 CONFIG_PACKAGE_cgi-io=y
-CONFIG_PACKAGE_libiwinfo-lua=y
-CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_liblucihttp=y
-CONFIG_PACKAGE_liblucihttp-lua=y
-CONFIG_PACKAGE_libubus-lua=y
-CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-opkg=y
diff --git a/configs/common/nss b/configs/common/nss
index 0805c6e..11912ae 100644
--- a/configs/common/nss
+++ b/configs/common/nss
@@ -2,12 +2,7 @@
 
 # LuCI
 CONFIG_PACKAGE_cgi-io=y
-CONFIG_PACKAGE_libiwinfo-lua=y
-CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_liblucihttp=y
-CONFIG_PACKAGE_liblucihttp-lua=y
-CONFIG_PACKAGE_libubus-lua=y
-CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-opkg=y
diff --git a/openwrt-configure.sh b/openwrt-configure.sh
index 90db21e..519a1a2 100755
--- a/openwrt-configure.sh
+++ b/openwrt-configure.sh
@@ -15,6 +15,7 @@ INSTALL_HTTPS_DNS_PROXY=${INSTALL_HTTPS_DNS_PROXY:-'false'}
 INSTALL_DNSCRYPT_PROXY2=${INSTALL_DNSCRYPT_PROXY2:-'true'}
 CRYPTO_LIB=${CRYPTO_LIB:-''} # wolfssl or openssl
 ADDITIONAL_DRIVERS=${ADDITIONAL_DRIVERS:-'kmod-mt7921e kmod-mt7921-common kmod-mt7921-firmware'}
+INSTALL_LANG_PACKAGES=${INSTALL_LANG_PACKAGES:-'true'}
 
 # To replace mbedtls with openssl via firmware-selector, just add:
 # -wpad-basic-mbedtls -libustream-mbedtls -libmbedtls libustream-openssl wpad-openssl luci-ssl-openssl
@@ -51,9 +52,9 @@ fi
 # basic packages
 PACKAGES="collectd collectd-mod-sensors \
 collectd-mod-dns collectd-mod-wireless \
-luci-app-statistics luci luci-i18n-base-pl vim htop \
-curl iperf3 luci-app-attendedsysupgrade \
-owut bmon irqbalance luci-app-irqbalance rsync \
+luci-app-statistics luci vim htop \
+curl iperf3 owut bmon \
+irqbalance luci-app-irqbalance rsync \
 bind-dig ethtool-full pciutils tcpdump"
 
 if [[ "$INSTALL_DAWN" =~ True|true ]]; then
@@ -82,6 +83,10 @@ if ! [[ "$DEVICE" =~ Main|main ]] && [[ "$INSTALL_BRIDGER" =~ True|true ]]; then
     PACKAGES="$PACKAGES bridger"
 fi
 
+if [[ "$INSTALL_LANG_PACKAGES" =~ True|true ]]; then
+    PACKAGES="$PACKAGES luci-i18n-firewall-pl luci-i18n-irqbalance-pl luci-i18n-opkg-pl luci-i18n-statistics-pl luci-i18n-usteer-pl luci-i18n-base-pl"
+fi
+
 COMMAND="$COMMAND; opkg install $PACKAGES $ADDITIONAL_DRIVERS; /etc/init.d/uhttpd start ; /etc/init.d/uhttpd enable;"
 
 read -n 1 -r -p "Should I execute command: $COMMAND on root@$ROUTER_IP? " yn