diff --git a/package/ctcgfw/luci-app-diskman/Makefile b/package/ctcgfw/luci-app-diskman/Makefile index 23d375a26d..c1ef35c2c8 100644 --- a/package/ctcgfw/luci-app-diskman/Makefile +++ b/package/ctcgfw/luci-app-diskman/Makefile @@ -6,15 +6,23 @@ PKG_RELEASE:=beta PKG_MAINTAINER:=lisaac PKG_LICENSE:=AGPL-3.0 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/lisaac/luci-app-diskman.git +PKG_SOURCE_VERSION:=$(PKG_VERSION) + +PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) + include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME)/config config PACKAGE_$(PKG_NAME)_INCLUDE_btrfs_progs bool "Include btrfs-progs" - default n + default y config PACKAGE_$(PKG_NAME)_INCLUDE_lsblk bool "Include lsblk" - default n + default y config PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include mdadm" default n @@ -49,6 +57,7 @@ define Package/$(PKG_NAME)/description endef define Build/Prepare + tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(BUILD_DIR) endef define Build/Compile @@ -60,10 +69,17 @@ rm -fr /tmp/luci-indexcache /tmp/luci-modulecache endef define Package/$(PKG_NAME)/install + # $(INSTALL_DIR) $(1)/ + # cp -pR $(PKG_BUILD_DIR)/root/* $(1)/ + # $(INSTALL_DIR) $(1)/www + # cp -pR $(PKG_BUILD_DIR)/htdoc/* $(1)/www $(INSTALL_DIR) $(1)/usr/lib/lua/luci - cp -pR ./luasrc/* $(1)/usr/lib/lua/luci/ + cp -pR $(PKG_BUILD_DIR)/luasrc/* $(1)/usr/lib/lua/luci/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - po2lmo ./po/zh_Hans/diskman.po $(1)/usr/lib/lua/luci/i18n/diskman.zh-cn.lmo + $$(foreach po,$$(shell find $(PKG_BUILD_DIR)/po/*/*.po), \ + po2lmo $$(po) \ + $(1)/usr/lib/lua/luci/i18n/diskman.$$(shell echo $$(po) | awk -F'/' '{print $$$$(NF-1)}').lmo;) + #po2lmo $(PKG_BUILD_DIR)/po/zh-cn/diskman.po $(1)/usr/lib/lua/luci/i18n/diskman.zh-cn.lmo endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/ctcgfw/luci-app-diskman/po/zh_Hans/diskman.po b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po similarity index 100% rename from package/ctcgfw/luci-app-diskman/po/zh_Hans/diskman.po rename to package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po