From df094d2df7ba0efc2c34f5893a1e7faeeebf2518 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Thu, 5 Mar 2020 11:42:29 +0800
Subject: [PATCH] k3screenctrl: rename

---
 package/ctcgfw/luci-app-k3screenctrl/Makefile    |  13 ++++---------
 .../files/luci/i18n/k3screenctrl.zh-cn.lmo       | Bin 1444 -> 0 bytes
 .../luci => luasrc}/controller/k3screenctrl.lua  |   0
 .../luci => luasrc}/model/cbi/k3screenctrl.lua   |   0
 .../zh-cn/k3screenctrl.po}                       |   0
 5 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.lmo
 rename package/ctcgfw/luci-app-k3screenctrl/{files/luci => luasrc}/controller/k3screenctrl.lua (100%)
 rename package/ctcgfw/luci-app-k3screenctrl/{files/luci => luasrc}/model/cbi/k3screenctrl.lua (100%)
 rename package/ctcgfw/luci-app-k3screenctrl/{files/luci/i18n/k3screenctrl.zh-cn.po => po/zh-cn/k3screenctrl.po} (100%)

diff --git a/package/ctcgfw/luci-app-k3screenctrl/Makefile b/package/ctcgfw/luci-app-k3screenctrl/Makefile
index 7666b5b568..3b2c59c5e0 100644
--- a/package/ctcgfw/luci-app-k3screenctrl/Makefile
+++ b/package/ctcgfw/luci-app-k3screenctrl/Makefile
@@ -32,18 +32,13 @@ define Package/$(PKG_NAME)/description
 	LuCI Support for k3screenctrl.
 endef
 
-define Build/Prepare
-	$(foreach po,$(wildcard ${CURDIR}/files/luci/i18n/*.po), \
-		po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));)
-endef
-
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
-	$(INSTALL_DATA) ./files/luci/controller/k3screenctrl.lua $(1)/usr/lib/lua/luci/controller/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/k3screenctrl.*.lmo $(1)/usr/lib/lua/luci/i18n/
+	$(INSTALL_DATA) ./luasrc/controller/k3screenctrl.lua $(1)/usr/lib/lua/luci/controller/
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi
-	$(INSTALL_DATA) ./files/luci/model/cbi/k3screenctrl.lua $(1)/usr/lib/lua/luci/model/cbi/
+	$(INSTALL_DATA) ./luasrc/model/cbi/k3screenctrl.lua $(1)/usr/lib/lua/luci/model/cbi/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
+	po2lmo ./po/zh-cn/k3screenctrl.po $(1)/usr/lib/lua/luci/i18n/k3screenctrl.zh-cn.lmo
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.lmo b/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.lmo
deleted file mode 100644
index 4ee5539d5e338798cf1969791ab4466b27c07ca0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmZvadrVVT9LFz3>SA$#+mdd$StHRwgz=bcWSF4Sfu>Fbx0y_riIOdYC}4FDS>#b@
z%d?R}OKG5GD9TDHgF;){;@k+jm>Gf+*^H8`=ib|mjPV!~ac1Asvd155^2_;s&iD5`
zy`;CEI2sv-S9B4J-s@0#-9}C?=Pe%6p&$W~v^iOW8CRU!;&obZ%W4OF+Wr}rp5cd^
zS&J>e>{lk%pkf<py>7#dt0s_5td*pq&!_GFsicfy7@{0xo2*Fo=`}Pz5X3fG*;>ng
zHJ@J1YthHZIfqG4C1)&U7*^-uI-HW%GvAW1_RGY15%oB;*=sNHnQZ?fvbJizhwkQS
zAPT2<*u<9hu&PepR3phtI(4ilH}}LbSy8?uRwf~i0e)CRT3WfG2Da7kcTRu;kMYk7
z{rgt5xl@DYfrvl{<oX{EyS8{(qk>@)C0yru%(`vmOo$ISNh@da%DGKKl$D5s?spPa
zE)eHu#Q9G;N!2BW!Q!OKh(5J-oC$mSDhAnp58g@HPplf8wn6{NU1;T%ZJ4X}3%;ZT
z_vJ>m+2YUh+MT$sb_8}V)v)D#sOwPkofw4k)L{kG?XF<8^~h^d^OhdkSH<d3&!_1i
z-D<@3w-c)iy1fFU5OodP<RBgk??x=K)^okIroEd~^fOFw-rfd5)}~twBlr-j3PW5=
z_K~)+!weJDL0LE(a{N8P;WwbaPg$h6X;!&*r@=3QiKCZ(FUnti178Dk1@>Hwd&`Ea
zS(kr6z6>nfdS39RxNCX`SWY?4P<8UfORLhsQQ)w+Wv5EV#bDZ?X{smvDJvMbzB?5@
z)kBllMGmoFdN)J=mg>p2eA)7uE7(AAh;oYbY+lIq$_VJ#h7qQ%nHk-<dcPNZ92~N9
z!|ks5IgJDSGWdm^<9FWGjYVt(*ZB4Oi_5RbM8RM&ICM`|eNo!vR4(eT2MhO=r#xIU
zxr4_32HTuFnC>oXuZ~2#hU$6OhDHlhW%=;qVPPi^WWSTGv=+cO!y-<*pOMrZ{NN$t
z@urOM(=D2G=^;@D>Tjj2y1MHgCyS4PUQD@e|0mM9?Q8R((|Lsr(!s{rLd6LDG+1oQ
zfO_$wsSC3SQmNkFr&~I8Vv2)Lf5MKD2TvUpxtCDyE@j)e%55)t_BP^o`T5aDT0!`b
z9Qp!fd;4qZy{(Btu))s@;W1~`RvGvfWygc0bJ4SFd%-Ts9)UP%y?hj3VbDR!-;6ZQ
zNq;_41mE9pM1D^xGA%xVeo<7v_E}X<@E_V)#M3tl`R?P#QA?9{`mG^`iM;tF7o2I;
z<Es@sP2<PT%^$5D>&XO%QXVfJd3$135Qh9ml<(-jk1m*>*ayBr`EJgc?V|C8AHinI
zQ*lR{<>J_{;p<@QNbv<9laN7Uy|7STnRr0>dB$V-^gjywCFTCardP`_zd%a$U+Yg7
bX1~<Zj(Rj+IG^*pcsOr59QrECI1By)I#f)=

diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/controller/k3screenctrl.lua b/package/ctcgfw/luci-app-k3screenctrl/luasrc/controller/k3screenctrl.lua
similarity index 100%
rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/controller/k3screenctrl.lua
rename to package/ctcgfw/luci-app-k3screenctrl/luasrc/controller/k3screenctrl.lua
diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/model/cbi/k3screenctrl.lua b/package/ctcgfw/luci-app-k3screenctrl/luasrc/model/cbi/k3screenctrl.lua
similarity index 100%
rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/model/cbi/k3screenctrl.lua
rename to package/ctcgfw/luci-app-k3screenctrl/luasrc/model/cbi/k3screenctrl.lua
diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.po b/package/ctcgfw/luci-app-k3screenctrl/po/zh-cn/k3screenctrl.po
similarity index 100%
rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.po
rename to package/ctcgfw/luci-app-k3screenctrl/po/zh-cn/k3screenctrl.po