From e6cf83b8c0202ca256ce1b5aaa26459aaaa6532a Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 18 Mar 2015 06:37:44 -0400 Subject: [PATCH] Put default config into binary --- .bra.toml | 1 + cmd/web.go | 14 +- conf/README | 7 + conf/content/git-bare.zip | Bin 9910 -> 0 bytes models/repo.go | 79 ++- modules/bindata/bindata.go | 1041 ++++++++++++++++++++++++++++++++++++ modules/setting/setting.go | 8 +- 7 files changed, 1097 insertions(+), 53 deletions(-) create mode 100644 conf/README delete mode 100644 conf/content/git-bare.zip create mode 100644 modules/bindata/bindata.go diff --git a/.bra.toml b/.bra.toml index 0f52fcdde5..10e7c893f5 100644 --- a/.bra.toml +++ b/.bra.toml @@ -14,6 +14,7 @@ watch_dirs = [ watch_exts = [".go", ".ini"] build_delay = 1500 cmds = [ + #["go-bindata", "-o=modules/bindata/bindata.go", "-ignore=\\.DS_Store|README", "-pkg=bindata", "conf/..."], ["go", "install", "-tags", "sqlite cert"],# redis memcache ["go", "build", "-tags", "sqlite cert"], ["./gogs", "web"] diff --git a/cmd/web.go b/cmd/web.go index a06f5b85ed..f02a98313e 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -34,6 +34,7 @@ import ( "github.com/gogits/gogs/modules/auth/apiv1" "github.com/gogits/gogs/modules/avatar" "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" @@ -82,7 +83,7 @@ func checkVersion() { {"github.com/macaron-contrib/binding", binding.Version, "0.0.6"}, {"github.com/macaron-contrib/cache", cache.Version, "0.0.7"}, {"github.com/macaron-contrib/csrf", csrf.Version, "0.0.3"}, - {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.5"}, + {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.7"}, {"github.com/macaron-contrib/session", session.Version, "0.1.6"}, {"gopkg.in/ini.v1", ini.Version, "1.2.0"}, } @@ -123,9 +124,18 @@ func newMacaron() *macaron.Macaron { Funcs: []template.FuncMap{base.TemplateFuncs}, IndentJSON: macaron.Env != macaron.PROD, })) + + localeNames, err := bindata.AssetDir("conf/locale") + if err != nil { + log.Fatal(4, "Fail to list locale files: %v", err) + } + localFiles := make(map[string][]byte) + for _, name := range localeNames { + localFiles[name] = bindata.MustAsset("conf/locale/" + name) + } m.Use(i18n.I18n(i18n.Options{ SubURL: setting.AppSubUrl, - Directory: path.Join(setting.ConfRootPath, "locale"), + Files: localFiles, CustomDirectory: path.Join(setting.CustomPath, "conf/locale"), Langs: setting.Langs, Names: setting.Names, diff --git a/conf/README b/conf/README new file mode 100644 index 0000000000..e1e21f2031 --- /dev/null +++ b/conf/README @@ -0,0 +1,7 @@ +Execute following command in ROOT directory when anything is changed: + +$ go-bindata -o=modules/bindata/bindata.go -ignore="\\.DS_Store|README" -pkg=bindata conf/... + +Add -debug flag to make life easier in development(somehow isn't working): + +$ go-bindata -debug -o=modules/bindata/bindata.go -ignore="\\.DS_Store|README" -pkg=bindata conf/... \ No newline at end of file diff --git a/conf/content/git-bare.zip b/conf/content/git-bare.zip deleted file mode 100644 index fde0a1f96ee859f32e18e4b2241174d64cd728c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9910 zcmWIWW@Zs#U|`^2m=aRx!n|=|UJ3&PLo)*d0~-SaLvnszT4uUyk0D=!0uMuaMXUb@ z<~%od`2?AOE;A<6T+@f&A3dqqdHSrhq0Tjf7?l-AR0Y(R^KVdix-2^?o5{`N$-r!>dqV%5&Pn}MTf#hiPwE6}oIIfu=5hLr zXJ~-Gr>>vgDIJZIXU+$QYn%*cc*$^Txl-n($4m^U_Go7oFPCIsU=U|uU|?ZjVDNBt zbkX+m-5jLh<*R+|yoaxk=C$*_I(nYEk04sP7(f6NR3I9LK|z&~pPyZad);`f6|rS8o*ugvBCZAB3A>& zo&&LqG!z)En(uNX3G8|x!+FD?!8y%Vp+oNC;dfIwt=y`+qO6!}x%f)duK7)#d-!bR z7SqiKTTZ^)Y^uz!!dCO)tNJnqohUW7yWDCD&pQ81C=_?+GMp&(XSIW^NYl4NOZB`v z%yXr8NOf`_x>azXw)2sl{yiBp;p$DrH)TFmO`osS_QR*LWs3W|@}Nbmp|R`N%kqaV z4q;~YJi9Dyil&yM*oyuD-TP*@`>&s^j?TCfcjvik#M&#eavOh}Z~0SIwPM=qSJAes z)XY1#9yyoO{&9It`8wHEqG}(7T(5usch2^>-2M}ML8;sNj$M?P&h^E2 zORV#Xt^3-~_P&vs;}#cO#~&_Sba&gOg%?GmHid<3d2(|5qRbTs9$G)@@^4=z(SPac zg)Rl3tJ{~{Q8Jj4!MTg)|I(Ze#&u$RTQ@wHQn%Z%)?fPSu6(Y0llqxsGN=AiSS*=1 zw_tCphODGVcJ)dv4%UmMZsl%V?&>Njoc;o*BJlskeb!*N12s!b4B%)=j{pIcgT>nk$K~a_rk7> zjna{tT0ybXG>_l$5S7^X@r|6>t=W89ljhn>9&i+yz{(lF-eaQRS*G^739ooc4+Z?% zBCy$S^I9_&zstOg1r`UNo&7qy`{b4T-@+3={L88?uiX8&;P1pq|SMqhgU#^}^oqvV*Q+6uKBI=&0L9q&+IEpc2~W4-07h1=rVH=WOV zZ96Y6TTf6no6`@BT$%=LfFwI@a1_?&LSwR&CrzC+LcSN9zH9qYP((S6jk!q%K~yo!N=VF3dJ zg9JRg733F}=t2?yXY|SgK{FR$l@%TyFEThqIc(G&Dwx_&$v^&q;0T!i&B$QGs{w;4o(d`U3AERXU}u(kR4_-Y&bmI6PHat_vM~^K+enxg|cI1 z8h?LlwK>b1d#{eI41cYDQCj=ZgtePZ_e3p_?z`NYQ1Fh&vC7!>!Z~LdjXVs7jl6{`e?gTj0xJAMGG}@-Xum^(pBR1`J-F!78jA-u+WAtlDx~`1H&df5N5S zbn2X$>?C)OVUPMlPUnan|4jP-Ol3G`bba^FBV`IMM@zFVCM7Euyg z$)=a4eRszVpE{kpN-;f4RSm*EY^m50ZCbPM#lJhrlT%;wc34)}nNqmoZi=c z|8%`jvDC$wP5G#CF^lK>fi4CHhP{|+r?em?u>=+sx@QB0nhbbYF8rUD)EeJtT*0m{ zpfHv1QpuzT58keQ@%-JnJ-PaaXM9TV&T#IIW|QACRXtfSGI8>6d3Hb?lWFqgZ(g7V+?t3!6;+nx}7U zX3_84GOw~;>X^z2scQVHR{HnWPODw0+3~+GIBMg@eY=0}tM0zN?CFJ+bg{I?=M1yf z^fMpql$o&mNZ`UIey=<83rfNcN^YC_anAM@zdh-pw?rMPn|cc^TvyL^o`2-9SlU}% z{tr_&-@W{6&8=Ol51+Jn(=}bxJ*-_};lCv+C$dU)*2QUxX3AN<;a(>r?mlV84XxOf z59EvwvYq{$9I5Jb_v_y75Ql@?md@LCDe2pN<*6s)C(V04b3s?!-2bMD8R<)8IAeYWPu>NOjpW=hXm@w+_p=huR8-TABXKWEgT)&Fnh z3vSM1W?)#shFrUVLJg(Bs11qDzwIVaV^)9E&FqbYfM#R>&+S%Tj=TmIgI^P*UN}pM zxZj&sVOn|oj;yLS$FJMQ+#8u&7w76SW%@7LQu`~;D0EwHDTfYs$PRJe!;?O!?- z&mE=rH*xM$s9N(qHtV*z(8)hNQw*;>xql<_lVgkA-;jj%WBabB`5v0^!YbW*xobk! z&FYP5m$*!mSR2^{=kRY^9PnOItn=|=RkKAbM+2HYT?|y){onp@efi`3r6t94`dPYk zE_W#@AD_KP_?+?6pB7X2--qwNbl2xoTH3E=3yDsnU%~~jXVK4u7LzTzJipxrT z)Xp4UEFT;-d%Q+D?W4X47YppY}yc zz88GGW5JqiPU+s9jaFtx5AR0k{^x$L-|>{Uq(w=h#QW4uu_&KM6D9?h#q4=}u1a>z zZP736&Iz%}r5^jIta#Myk-vi3aOQ*+)`<($G|n@g{xH8rUF*dPF}}HTYg_HKiNzd@(yU_K9<6t9Oq>AG6O4U_T zjFocbQ=>1x`5^QEX@o*s`R+x3r02d7{cmfnRJG%O_SX*u)$*RtC!Mnk{&#-5{qyuM zbGL~;y;>>rxTZuj-1N=QdzP>BGFmTR=5yy-ef&n;>sF8A7(zc z=*P}uFYc)`UtV@t`u?M3OM0F9^Cvdnxz4hZIVxvCRnr!MiqFB3i~esf`1IG?Z_i0_ z{qHK5p0y-JXTP!g+4NZJPsxXXMJZF8Y?aO&7OFAo71||v{y?13PP0k#7Z(VbXXbvu3@#v1tp7xQY@(_d7iw<7xk@&)T=X;>r*;2cP)v}ex0!}DA!@jDH&6jYo3pFbW6k5DX1L&y1vR#EmBW&qN?Kq_fV^% z3G-eodhmSZMOJU!gU;Q$EB$9aKJEJ~!EEZTIe(V*q}^P%?eg5xUdPTe#aq8TiOXB{ zIVL~CNwrsJO7Jne?=j86vwUoPVkxjx;tC33Zq&9m?KcHfftW@6AMwK;M9RM)A_ucPvH=G>TYIX9+cs_H~` zwVhi_R0LCI9=`QdOo=NsEP!|31DjO1~)P{&*c)FKX-H3!AH%HKL2~LMSs(jIZSH5nit#6y&R*! zvh+n|`MKY2OUt&krC3X!`R(*H%=CSpq-|NWPRTsg15sZ0>#INhn)dF!Yk#AIdI?*z zr~<3XhOHjUS889E+8g4hmZM$VWg@K9SZZ)I`$e;B2~Wk(qHj4WRq5$X|7&Ag+r-&A zlCx4%l>~OrpI~sIC}^73Gu{ACyHj_Q7c}@z|1+<|t98o+d)2DsiM+plx}Qr`IP%x~ z+Q+EhcUEf%S)MG87Z-b9dw@Y&e$C1K(f04(zcjY-x;88BPodx6`2j|zvxRiJQZ7CZ z{&-+kg7bxm*VZgz4d3u-se?n_rcY{j+Hx3I2`e02Xu=TveB1L~Asj7>_#1Q5FTLdx zpM3wrhly+IT0FAz6CQQh<(!dhdKIxJu=U@GgR|c4>6G-b*wW}T1DQtC_ zxln)S%Htl#%csnHnUUPE-=!*O)2wZ~o@H!~ICjiw>yGBSg{Nz(5A&EWuReJ5=p*OJ z^AA3caN;lFzj*9!*^TG%3HkQyH*T+bedFNQ>$L{?O0tLVuiQO%+qDx5zJ-0^OI_y} zFrnO_)R%qb>dwoPmzHQvai9F<-v22Z;xZ&R#<=ox^7t=GeDmUc(`MlVVhi?0=Jw8? zIMv9~S47s?e`D{{rU*X0dv)K>m#be-|5%wAF7q&*_o!5Iv%BQ^UB`Zl`NXAO7M-_W z|99Y-5B##1-31~}be-OQeRi$HKI@r(Lj5kiw(re2_GPc4+V!8@R%E0@y_l9^am@ z)baSg^KlQKurB%{;AyLSeAUkPp=>Lc)W_`o_w8-8{Luu5^?K7YQryg>`YshQ1{+(wA=SdQd3i^?0Yim!3L3;jQ-N6^$Dm6YQ<*?#2FG z^e9jLg1?fRVA|PYk98_$jSElh_>(bHa;k+%B7>IpZ0j7u_)EKA-{MSS*tq9Lsp*@Z z#H#`9zf_A}T`77Mt^56EQ0uJ7E0VLEtPPFtbt~N1AbMu~l9R^oZaOU56D;;yb%wdW zj#ohMg#+HI$B*V)#5K%cJ5&7J^xi^)qsuRUm-C5CHa$Qf~kDdw5MH+i<`aIY;?S6(K7X| zUQ!10J!VIiK3|`(Li?`^4n10HSJ~0mXusL#i;eZvChAm-N_`CV_g znO|DJza;z>?*m&K*^4Dss#_-7E-BpqHSvkktCCv@20=gcMJ{wXZ;P+5VfgqoJvKJ= zv}}!4n8e8s-_LlibBGT=YpLGG^^xbe#U`_DQwNSYl8E1vd1 zb0zZ*k7b$@&duarGxbuB(xPyWwr8)nC2y8a@Ke~!V78P~!-`AmM!t5E#s8>~T8HoD z>tk~(4u;p9ON@QvqLDDo=Sw-C;DNrqELET1R^%6dy2H*TeSG!0euryi=B|s`6{Yv7 z%vvBl_4lD?OgGn_{IFosx%M08#v)?jlhgC770Y(5xtw?DR>jwiPmURGD!kltYG-AM z2=7L%HL0n$mDPXk|8&&Y>0QCPuH%M#xGZ?qF5_MLV|LN;X+`tIFSRb}5aoLFz3Rcm z$tRzb?-%?sFInvSk!SxWXD@riE;Q#)?1iI_i*DZA%xp4u`5#|}-0w@n{Wa6)=Krqz z-?G7b`vxcTHO zuXlb4+R6OpyIY%7SZ?0Yto5(kc>frky8XANL0Rp8Re_+@JgtrEq<02Ax+;7$+-5=d zDmQzF*J%RsHs@+ME`HgsD6_0X-e1s9vBT;+Ysj}5x2EoXtnf`tE&uLoDdYMqADc%1 z!#TZPhi-h||IEbq!RfUh>`_|-;!Jz@O=n_YxX!}BAdeUlC`v6zEJ}rr3Lp(5l?KNa zUp5e^QQQA$g0Zi?&g?_c)^B|@dA_usyYOLJ=IR^i(IFFKJeN&5+5cR{Qc+f6GW*jh zcW>XeO6N9g)o!XZbMyWPUQ^Y2LGm-hx=owDKj8f$R-GtV(;hJMs#jIOvQ|+m z^(Y;VYRxH!q^6xe5Vgyt$1M68UY{S^SvRBUKKA|xJ3{3uTf6s>kT|*qk61i zrQynnZuuEPEgO_Go*kHZFf4-M%x)9rtG^C@JErI%u6A(Nu0Pzep@N^ZCb~0ADNgk^ z=D6VYIX;8eLjTW$qNaB@9N#2mt~tJ|BktVFsbZ%sH14wQlF@OKPEwtj(9nDDlgp9t zb*V>H3~~w-N|&-3H8hA7PM#=zJZDMi$$~5Q8YTZ^Xzn)I6}aisyB5Z+9}ZeLe!f+v zTz$n$hfjO)>$_nRD}E_1N?NuxN9uu1&w~C3rbAjx&+iwf&k12NN?!B89 zcwL15&WW((v%Z%LZfU8O@;qq$uw&}f3oeiMgmj4b$fJ;HHsHFvqjFFsvxbA zzy0CV01=0$!BwqKzVytJF}ASfwVt%z_EO8CcDtMPzb76EVR&#Pbp#Qe!OXZ>&2)l)dTXf8*Xa` zZoX2nmu-zzmCMSqI=R!6(T2H1gZ8W~V_{&B=3`(GhNo$iQHr(Uf%&)11nRcc9St>m zbZf&?m1^%uJ{|M>N%7v4t?tpou+a0~-SYDL zcQ4*8pS*H{@LaaL3%uo3Kd#T&c*bI>m+hp!;*BOLBEH6=_E}M$YD(7gA%c8Nv01^fB&o3*xN#*|hS?F)&Lm?|!KQJ?i} z#i6j78=teTo%%+)!_8O6cwXV*g}*t3%K0Du73>Lbj94+#qwBH4jIDm$VG+0eJPufR zPpIrFKGzdqv`Vt{l|w`GKL291$6t27`+fV5uCu}8O$9IJv#UPmPOS)=BKQ6yyQJ;&f)r2~<z3$#*ukdE z_43z~Jwi*q2gI!qT|3i6d3)E@Q`g>S?R2T|YCbpP>V1)A_cUu8qOX5B_`A8a{8?4N z-9KEf=CF2hWaUkn$dS3`Puui+b>F?p?(Dgqb55Tx;;w1b(}Sgx${z1{wRihk-LmC7 zGFE@Zi~_jl6S|eT*PElSB>o)nnE9=?VfUxJwEe}Ek_BfU@v_gcUKUZ*D?4Fh%FMNQf@>CO zZ2Ir^qO|tPCT*#QZp-@Bw>j+6_;IYbRCJ!*XW^<_`I@z@TSEhtx7$~3xUg=|+J^L5 z=KQCw7#f$Y>-TM~e^3$Uwqw*%Otx#X=b6>R-rp9 zS4f4uzh89qZC+{3@vWD(maT31!WTEI=4iHGSr+GBXaB5d*}(OQr754AK0nJj5Z9}1 zcfa)P_YSA~Y^Tmylt{Cg^_tecw3gewF}l=xcBDYj$!84$xusLzyi`~vdwQYUotmne zJ6=&gI<7izT)BU7Xy5? zzCUQ~QfZGRLZ9~6Xq*f&7l%}NW_BwJMG7xe3J}+rO_o^FZ`a6VT zDwzufZ_hWI^kn*z_8YzF=2PFb9p5vPYq8*s8yU%(i!vkBxUv`c=U;Z{<$I%-n^}4+ z`<>aI)dlAJB#bm2MMPO{o@m*%Y9Z6Y^yeqMbG$zvW8^A+VE&cqc;FkR$Az|{a~Ir< zI(Mx9#GE$`;#0q!uu+)QP#Sq7&QM#B%PwjDpKlxdEF^kcg*QbpD!cyre0b-Hviou@8u8J2)6+D~>D=kP&&cW~tyKq0mTo?^=HN;#*5Tni|!^{N*sXyFY#85v{ zn-^6VuE=BGD1$kBAA6R8r>o`lqox8i}ta=ECNr6L2QH0 zU|{nS%mx^ZZWHQc8?sG#tSC02PQ4*p)inbWdN314%_f+Q zFdE$^)L9>7n|86oZNfGOM2=;slO@QOec(X03};lqe1T4*`wDdk7ull2JjfQI4Co^J z2$q)!S%lgwuStGkWA7(7H>L%WF?2hI@akQH(q6S4aIqV0d&OoQ}1qUyR$vH?SgKJ&t z8b2M$cyLWksqv_hc}Nyobt4<=rVJ^f&}n>u!i^FrPhrMFS_G6D&V^z)pB&W9;8p~2 XX0w7;S22h&h%sbwFff?OfofI&!Vk