diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index 5a16772bdb..23193d1f04 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -20,11 +20,11 @@ menu "Configuration" config PACKAGE_$(PKG_NAME)_INCLUDE_ipt2socks bool "Include ipt2socks" default y - + config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks bool "Include Shadowsocks Redir (ss-redir)" default n - + config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR bool "Include ShadowsocksR Redir (ssr-redir)" default y @@ -32,11 +32,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_socks bool "Include Shadowsocks Socks (ss-local)" default n - + config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_socks bool "Include ShadowsocksR Socks (ssr-local)" default n - + config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray bool "Include V2ray" default y @@ -44,11 +44,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan bool "Include Trojan" default n - + config PACKAGE_$(PKG_NAME)_INCLUDE_Brook bool "Include Brook" default n - + config PACKAGE_$(PKG_NAME)_INCLUDE_kcptun bool "Include kcptun" default n @@ -56,19 +56,19 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_kcptun config PACKAGE_$(PKG_NAME)_INCLUDE_haproxy bool "Include haproxy" default y - + config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG bool "Include ChinaDNS-NG" default y - + config PACKAGE_$(PKG_NAME)_INCLUDE_pdnsd bool "Include pdnsd" default y - + config PACKAGE_$(PKG_NAME)_INCLUDE_dns2socks bool "Include dns2socks" default y - + config PACKAGE_$(PKG_NAME)_INCLUDE_v2ray-plugin bool "Include v2ray-plugin (Shadowsocks plugin)" default n @@ -126,19 +126,22 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./root/etc/config/passwall $(1)/etc/config/passwall $(INSTALL_CONF) ./root/etc/config/passwall_show $(1)/etc/config/passwall_show - + $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_CONF) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults - + $(INSTALL_BIN) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults + $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./root/etc/init.d/passwall $(1)/etc/init.d/passwall - + $(INSTALL_DIR) $(1)/usr/share/passwall cp -pR ./root/usr/share/passwall/* $(1)/usr/share/passwall - + + $(INSTALL_DIR) $(1)/usr/usr/share/rpcd/acl.d + $(INSTALL_CONF) ./root/usr/usr/share/rpcd/acl.d/*.json $(1)/usr/usr/share/rpcd/acl.d/ + $(INSTALL_DIR) $(1)/usr/lib/lua/luci cp -pR ./luasrc/* $(1)/usr/lib/lua/luci/ - + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n po2lmo ./po/zh_Hans/passwall.po $(1)/usr/lib/lua/luci/i18n/passwall.zh-cn.lmo endef diff --git a/package/lienol/luci-app-passwall/files/usr/share/rpcd/acl.d/luci-app-passwall.json b/package/lienol/luci-app-passwall/root/usr/usr/share/rpcd/acl.d/luci-app-passwall.json similarity index 100% rename from package/lienol/luci-app-passwall/files/usr/share/rpcd/acl.d/luci-app-passwall.json rename to package/lienol/luci-app-passwall/root/usr/usr/share/rpcd/acl.d/luci-app-passwall.json