From c40fdc0dd5f60cf63f60b1aacec0b62f9a8a1a5b Mon Sep 17 00:00:00 2001
From: q-- <q--@github.com>
Date: Tue, 21 Jan 2014 10:29:30 +0100
Subject: [PATCH 1/4] Renamed d3 to D3, added D3 icons

---
 share/apps.json              |   2 +-
 share/images/icons-32/D3.png | Bin 0 -> 1449 bytes
 share/images/icons/d3.png    | Bin 634 -> 642 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 share/images/icons-32/D3.png

diff --git a/share/apps.json b/share/apps.json
index 2c0dbfa2c..4ab3204dc 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -608,7 +608,7 @@
 			"script": "cufon-yui\\.js",
 			"env": "^Cufon$"
 		},
-		"d3": {
+		"D3": {
 			"website": "d3js.org",
 			"cats": [ 25 ],
 			"script": "d3(?:\\. v[0-9]+)?(?:\\.min)?\\.js",
diff --git a/share/images/icons-32/D3.png b/share/images/icons-32/D3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8645ec897b7905032ad758875228b754631d8faa
GIT binary patch
literal 1449
zcmV;a1y=frP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000GWNkl<Zc-qaD
zZH!!H6~}-7bMMaVPG?^%G0-YlYOHIGiIR#<19kDODG1uu1rvM$iz|sP*b*a}YA1X^
zmWaVbi<Fv*LK?TSO}dFR+gc+cX_fGz(4yt7M5<s}l67ah-JSa!Kg`R{&d$z`pY(ot
z=FXgRfB!kp{h#x||M=2a|22*P`838j?xQkZaPz~mXn*^izdT+J&gF8p=832JiMZWF
z#tbA!1}3Uj$3#KKsEL0O`N1gCgBRVq|M9s3Zo0;iQxY+26%OJU^6l9>haM6*z@ZHr
zR#@Z@OTK&_c=5g@u(;xpv3Dx))m1x(PtORr`D$+fum1jsoEx(P`<@1PWaGvqp(QzJ
z;=N74t5$z8j_va9AMXDvfHesRvDza)I=1c8n*r7i4gJF{^k6(+f!l&`B$m5}!zcRJ
zzr7@&DR_BJ8@_A&JD<80;Ici#r&I2m%zR=tY+iWzerbs9uHqJK?e!+%sC<t*@@uoV
z4etRs^2Muek@$X-@Ulpk_@IFgAO^sHfH8=83gHdlASAJKEO%u$z$+8!yCrRxe87wW
zV8D#KBu32K>%cKXW_(ulygB}j-t)Yr@HOx)h)fN9rZUEX?01LPH}d&k`mfj+OTUuP
z+zRPQHA)`))`k@phkd|G<R#zKi16@<?Dk(DZ1kMxZu;a=i@3M~FS{o4)7B`l<9qx5
zmPDybC4asiTyiY3TNmthk@9ok<`|@Hq2$io-ck4P8O)P<?}RI?9lL$QIrHTo-*Wl;
zOkvF&xIoftYPM&O=dRp^eDkaqvMhpdUH01t?gz-<vF?h3Sp3@SQGvwHSLEL`vAAxt
zf?rs(0)lCGJveeCE~%8;d|Qk0^Ny@<Q{;Ed3okn2p{512cc+g?J~^j9021%41e#7F
zr=ufT+0hw}%kX+|8Gk<4E*@@LfUe$~AWqf7k>jGP5+@%k|K8qSSlQ8)oRE2_fltLs
zu2(J>?7th{9@oN4+cI4hq-v3wOkqW5SK(zd3Ns=+R%BhpS<vL=gS`=ANgX&6Z&czG
zI%?gLZcCOg>YP3$ky!EkU^w^qU~km4fbkc`Ka9MkZhKZZIa2_Z)tfEpw&a3r*Yqhx
zK3!}=tQb9!-_*2#xGm|cZpX9SfIU`mi~9{OTZJd9!M}{cOXaw@wQzo>v+z$vIwL_8
zg-uQMfvMd+?+?!7K9QOTd26q+VnBrpGFuP7S}*s^Jw3|^dKQr>S0+r^-wP9|x5{{R
zK>_3Uee~SelHUXG0y$^nvmtM-Guyy{wyh%#2hy1xmmNg@u~{9o5T7dKQ*8~m;Ou>C
z-xFKmkrKSP!>OcIi$bLz1lZApd(NvJ>1vr?8fPcps9S-F`#<tFC50R1+6u~)vcN^<
z^Vuk$Oot~Ief`j-jo6bv>ABhA?s_9#;%Gd%`;x&@3j>$HyGfFjxLNtNo&$H`DHK|?
z4Zw3f@#HztkA=UbXzcQ!@(UeS&3B#%=D&@B-qJ)V1{5=C2uHy^T;JYz=yw2T7ROse
z=<_;|c@HykH~9lL2e>fY<?7G$9U274-@EQ2wM3g69^>i_Fym+G>;CYp%?o$cgHPc4
zd~4sx4uJemKfct^5T<t%r(UiWp*l08O2n~L3%69Y;)Sc==#M6SsI710!O}lpVuk28
zz&lC@#0#<3lSrW<+<3+#*6Z3w-z*7e40qR`-0gF%on33vH;g<3kl(fb1BQ+Q-LrFS
znaI3^Nb10+F#RZPnbmDyc=VM@hXuV^wm3mkz$oaL#1j;vq1LaAJU7dtJJ)Se;<o|Q
zpciY!J4hk>G||7iurLLBUHHQxggtFvdh8_sZ`XeS>(_2Z7?*ht00000NkvXXu0mjf
D#xLVY

literal 0
HcmV?d00001

diff --git a/share/images/icons/d3.png b/share/images/icons/d3.png
index 06464af2965cb5968248b764b4669da1287730f3..74bb08adcdb3fc1dd784665314dd6601f2ad6a04 100644
GIT binary patch
delta 617
zcmV-v0+#*y1cC*SB!5XsL_t(|+NF|Bh|N(LhoAR-&z=8VGj~X%EXbsWP(p@DNFhmK
z<fG(sp)Ampm9kZ&NW(_S_s4>mA|HvRG#eV4jfJK(qKw9v=KBBdc`fd}zUJ<nI-SnP
z@990yIl_N789KDhQU8wmM_2C=;d<fZ?FUafI`-zwyVQJ~8Go2LW{jBmdo#IQV)E&Q
z=g+4y)VbAB2X#csBN`u*$gZBZ%*y5BBQvl615)Y!@Kf{fdL0{fP}WE(zHFOAUr-L#
z2xG?DDMJm1RW+^#Ho9^Ijs2)2>LA`CWS82nbzca<SE}mjpuWkB-ajCF6nF}B1IHVa
z(kzs2epj=0_<z{C6~ME~xw~eZF>@?{1#i)Rq>hXh<4)8Es+B0d9bjf_T#zKX+%)d9
zP_96Y0j=>e-;j7qsy@sY0*L&$SD28UupEo3K7#qxS^(7Or|bdnN##ZVGJZnZ-q=)n
zWrmv(NjO^*5Y1bv9@KoW0+@(8g{E|VLsO~O%%v`JV1EptdB*37)|9qa9Yl#e07cTd
z8nRZ@pVv43n42%8uho3>-+<}GhN9Hnl=^J37P1eO3a(UkzXI>jcms8E4e7k3F)d2*
z;?gZRA)>RzbvMXVTmT`a)}7z~q+{gl$_;|&L_LrBQBiL#UopOs(TmF*7jOlHYS>--
zMnk$JKVlkocqw-M`mt5H<$0&p3WMFrGFg$&>e^hxDGAA|F=6xjNlQ4Vpo54E;?n1$
zHzT?f*c?<=dDJW7It)4u$-h8+5RGq8?@XqJ4j}spt`Pib4+PCZ00000NkvXXu0mjf
DKVLZ~

delta 609
zcmV-n0-pVX1^NV#B!59kL_t(|0ky$PNEC4#!13?Qj=RO;ql}`kj5=6&5PDcq#1iy?
zE)jaFgA_y*6jXG`=yfTIPKA+XhgJ*<>R|LD0xy9@bP`Nb(@0&@wRLy>&&>b7^J@-!
ziUKcwKFpi%lM<WieY1P|%aexT@mv{mF)-;nzXm^T54tbhl7GkR`{gbocMwTd{gn5o
z+R}qP`$nftjDInGEjQ(5&5%4Gko$-{bVQP+A|0h7kD?;2h}=iyd2L_tJ$WmY&cz8i
zgr;Vc6X`j07+B7xy^tA&iBT|s*x*E=auF<D2}>5$So(Q&;O=Sxh8#kbWebh&KCK;p
z7Bb7Ad<|6Fkbn9LzJ^sb5M2QI-!Pj2<>+jrFhj_u$e7p+1p#dcevA<Gk3m^2tlI+G
zgRuedJrD<ixXQcQC1g|Nt6&0Uzz?vTazttPISf<7;AX*D2v!{208A`v+fk2@O_8gu
zG`<0)v5bWnL39DU0=NMLF>ni@Jn)=M-MW>AkVBF3On(+%gX4ijh!jdd<se&tz=5a@
zT7mKrqcarQgc@rp=^M{ai*~`}LAzLDV`(6#zz389F9%+pk(5py+lWKRCiJuy)7ja2
z?Z$`5)t>%L3V#YjfdEDW0q8Wd1C!J3ucYN(*T*xhpDFMc>&SNE&HF3rZZ~ae`*yuP
zEgf4$URrM!)xI^GJh7qc^1-Ua(QT9i7XNbv?34ABH#e@`_U!!57jG}_cz3B`^?~CF
vR$NICVXhh*vCk%`IJbwzO$nla#eDb!9I7P?1lByc00000NkvXXu0mjfOv@j4


From 73c0240bc240cba08d851da5f91b31b6349ac732 Mon Sep 17 00:00:00 2001
From: q-- <q--@github.com>
Date: Tue, 21 Jan 2014 11:35:21 +0100
Subject: [PATCH 2/4] Added icons for Express Based on logo found at
 https://github.com/visionmedia/express

---
 share/images/icons-32/Express.png | Bin 0 -> 1407 bytes
 share/images/icons/Express.png    | Bin 634 -> 593 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 share/images/icons-32/Express.png

diff --git a/share/images/icons-32/Express.png b/share/images/icons-32/Express.png
new file mode 100644
index 0000000000000000000000000000000000000000..a298292ad3c2aedd1d07297ba4508abdce7397ca
GIT binary patch
literal 1407
zcmV-_1%UdAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000F>Nkl<Zc-qBR
zYfRHu6o;0=09{O$NrKY^ml!@QbNjSp%i@@TuL2^Ew!B)PKwDbqlhPN^7D{QcyhM-!
zf*>Mqc{`AikZjXsi(4jJ6r%{^nN5Ns6WH#~E&XVDwaadDa{uR_d+#~-oO93l9Ve$9
z4ulW^&-Z^B|FFG#pd=<aJ=;Hora2iz)x>i|ImWUp`mt~B(N|ur9&mE>0O1}z1H;_R
z9Q|wvEfImxH6|}(4fu71*0|0V$kv0Y34eh?D1y#@WV%$<P~X&Y#38~BC6$M`VpV@w
zYzm4^;osF5N-lsxUT<1^YhcJvp*37R8BALYjZT_1*EO+Wt?QnJ3uGE!23z<%lFoWQ
zFf_`?|58N?B1{CnEQgelr6Vac22ygG)P>FxU_s7Si+N^d>qjEuSSThbO$<D7*TPkK
z7mr2K*~?T0=X*HdE&NZWE^rsf)P!FjPB_15Pfg=ZLUz8%#g9yN$Gk#YC<03$u0$n*
zGe|oY-qGEEP^`>dqA)n)_%`s12!Ti1o%PiF@hr{BmtglbG<UFeyjfp#xz<0J_TtI2
zDL>5j3=X^O#f7|#EQ=BlL-*)x!E|0>*}iQz8B41U$0VgAP(q9O%GyS^y~fbupMPLi
zxvZ?dI!>lAkTTb}y%h?IEBXRMqo=_1@4Wl|aaWj~?RiC|m9>@&=uPDh7#z{`mWzLT
zG;tt-BSII;%+;8$sA(kG`;3b(n{fgov~>2I2s|H!I(r5_vbnhJRzL02z|gg4Q@{IT
zest_xf+KQCN_wWn3h*S6)=*;JDsn40A_c<V;4e2vWm0~o+7iS<x%LOS#xQPkVX8>^
zI7?S}7k`VDT33i-0w`oR(U?4oD^G{VvD2j4$hN8YGIZ)fY=YB&G)(1Y$@wVehRp>~
zNH*a4nb;!vQL!r5SE$e)a|GeDlG3F|iz{mN0U@;4HWdhfD21o8oXC~T0?k=xyNSu$
zJc})mqj0DXHWm0Xh>G|!^#~*)Efkl0Af1CK56|!l)GVP~VN-z+YQjG)oqcSl|7$?;
zSx*%!#kj08xe_-h#Uw`%ASP05GM^;Z6nNws%RFr=00DzQfr`xnq9i)<at${-womCi
zN!A@{mTu0H2NYV8ql90nyKc#-)eX&}*3Leo&4nVlHlGro`nNSFI4lzaNU^{&fn4(v
zP}DV>3wsCeM16KDbbaXSu``&jYihN-7R<~oVAB(zsvhzSqHI8UH`rYK`03=^>5wWx
z%Noq*8cXeVLq@ia;N*JPS!cQwOO9k9xSY?H8??sKu7HrJ8PNFPiL()Qy8)oP2c97h
zJdmjJCb!)nQRaEarSK6?qRQXI1Pva06@K-4tHt+Sy<e$<DDkMNwJUK)0H@qs-{wcA
ztONR0S#iRyl>iWmg%d&G{<9JEMYX=@$ETB1J3D7^c+?A?;UaWFOEYuxVb%u46Pgmj
z%<R0)8!W$Ean9Bi5uoO~Tl<53aK_J23l^*Dn%>*h4a%$Pd{}(h{JBWR%C#HqQvC0O
zPXa7W37}h24&Z-U0+&cj<P!4=FS)4o#W-LIVbM%W0_(dyk{J?}xWwd17c~VXK6~<E
zb9?s@5HwDXj7Ldn()&=)Bj8rvTlA3Lrt<3W1g_*K+>k)(?W()c=4DqDudS_l)Hk)I
zKq;L*6HZ6xA{ejb>H?%GC|-ctQ4$FR7-B)J$i+?TYG_mvg2uHEnprA#fkQIc^70Gk
zO_2JXFC>z(k3T;x1e`Z$EUiSC0J;r+L8b_MZ;zBcoOt4EwZ@L%{J-pg@cu&-+eZKZ
N002ovPDHLkV1jn@pK<^I

literal 0
HcmV?d00001

diff --git a/share/images/icons/Express.png b/share/images/icons/Express.png
index 06464af2965cb5968248b764b4669da1287730f3..fe82b67fb74a1479fcafaef5b1068ef981dca4bf 100644
GIT binary patch
delta 568
zcmV-80>}OO1knVLB!3u5L_t(|+GAiq0~@yPlFluyYf3MuIGmbSz9%)W>_BEw^^Df;
z$vPnUww}pM47dPLp?hj>+4;n*V%Puw|Fgiv3o05+;?fJ&0_EF5{H{r}7%?<gHFdd0
zr{rw|v4v#y8U3S@nR7~NnWIv2nPF<;Gm6TSvrD@%G&gll<bO=bD?bOcmD%1al&!w4
z7sZ(+H7#KN)Y*%Kfv%{JOwRE~F`&GzJs;@jED*b>s)-q!_wvi@!CuNNtjs8^Z0tpm
z1UhXS&~{!1B0xZNss=Dj=AfEhQGW*P)Y=xV;+kf5AdP{6;v5C#4J@q_rtl=^l&(NA
zAU3_=63|`YX@B|UF=_b~QP?ohi_ytBB@va49SOj|-hpC3SVGqIgv_Fp_>96VAkM&r
zfod{hQuET|Gm9cn49F^~KFB}<0EQQ8V#+D0xd@_xiHHN}KNg@(7#Nr$S;1=Z%N08M
zrxl_Ykdj+AqoSeR6r9Q?Ovjp3fd+#O2v5ukNH46Mhkqj3J!ytH(2tv;TqaOjC<P{-
zjKV5LU<zeQ$}V9=xVE+}v#2T;!-nkQngzwx%{BP^4vdYG?2_8vne&$jqDb^lo5Qqc
z??GOmg5`N-bq(Q3*&z*WefriO!NQe|okjssDc(Q}8gk3(x<cYIRPco^TY7#)El^=k
zMnUD2x-r(?4Hb=@3yZ3nC#U3;r7u~vK>(yKudJR8rUwB0IqE~PbK&Ly0000<MNUMn
GLSTZ!*%H(M

delta 609
zcmV-n0-pWR1o{M!B!59kL_t(|0ky$PNEC4#!13?Qj=RO;ql}`kj5=6&5PDcq#1iy?
zE)jaFgA_y*6jXG`=yfTIPKA+XhgJ*<>R|LD0xy9@bP`Nb(@0&@wRLy>&&>b7^J@-!
ziUKcwKFpi%lM<WieY1P|%aexT@mv{mF)-;nzXm^T54tbhl7GkR`{gbocMwTd{gn5o
z+R}qP`$nftjDInGEjQ(5&5%4Gko$-{bVQP+A|0h7kD?;2h}=iyd2L_tJ$WmY&cz8i
zgr;Vc6X`j07+B7xy^tA&iBT|s*x*E=auF<D2}>5$So(Q&;O=Sxh8#kbWebh&KCK;p
z7Bb7Ad<|6Fkbn9LzJ^sb5M2QI-!Pj2<>+jrFhj_u$e7p+1p#dcevA<Gk3m^2tlI+G
zgRuedJrD<ixXQcQC1g|Nt6&0Uzz?vTazttPISf<7;AX*D2v!{208A`v+fk2@O_8gu
zG`<0)v5bWnL39DU0=NMLF>ni@Jn)=M-MW>AkVBF3On(+%gX4ijh!jdd<se&tz=5a@
zT7mKrqcarQgc@rp=^M{ai*~`}LAzLDV`(6#zz389F9%+pk(5py+lWKRCiJuy)7ja2
z?Z$`5)t>%L3V#YjfdEDW0q8Wd1C!J3ucYN(*T*xhpDFMc>&SNE&HF3rZZ~ae`*yuP
zEgf4$URrM!)xI^GJh7qc^1-Ua(QT9i7XNbv?34ABH#e@`_U!!57jG}_cz3B`^?~CF
vR$NICVXhh*vCk%`IJbwzO$nla#eDb!9I7P?1lByc00000NkvXXu0mjf25BF~


From 9e0c8d16410b78a81368a15f92dfe3ac2a7d00d9 Mon Sep 17 00:00:00 2001
From: q-- <q--@github.com>
Date: Wed, 22 Jan 2014 11:35:21 +0100
Subject: [PATCH 3/4] =?UTF-8?q?Renamed=2016=C3=9716=20D3=20icon=20from=20d?=
 =?UTF-8?q?3.png=20to=20D3.png?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 share/images/icons/{d3.png => D3.png} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename share/images/icons/{d3.png => D3.png} (100%)

diff --git a/share/images/icons/d3.png b/share/images/icons/D3.png
similarity index 100%
rename from share/images/icons/d3.png
rename to share/images/icons/D3.png

From 2393603f1126e4c2095e00a59f46d329cc54d247 Mon Sep 17 00:00:00 2001
From: q-- <q--@github.com>
Date: Wed, 22 Jan 2014 12:22:23 +0100
Subject: [PATCH 4/4] Fixed Windows package script

---
 package.cmd | 51 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/package.cmd b/package.cmd
index ebdc8a49c..067d8b4fc 100644
--- a/package.cmd
+++ b/package.cmd
@@ -1,5 +1,5 @@
 ::	package.cmd
-::	Copyright (c) 2012 q-- <https://github.com/q-->
+::	Copyright (c) 2012-2014 q-- <https://github.com/q-->
 ::	
 ::	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 ::	
@@ -8,17 +8,6 @@
 ::	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 @echo off
 
-::Detect HTA host
-if exist %windir%\SysWOW64\mshta.exe goto hta64
-if exist %windir%\System32\mshta.exe goto hta32
-:hta32
-set hta=%windir%\System32\mshta.exe 
-goto endDetection
-:hta64
-set hta=%windir%\SysWOW64\mshta.exe 
-goto endDetection
-:endDetection
-
 ::Links
 call links.cmd
 
@@ -26,19 +15,45 @@ call links.cmd
 if exist wappalyzer-chrome.zip del wappalyzer-chrome.zip
 if exist wappalyzer-firefox.xpi del wappalyzer-firefox.xpi
 
+::Check if where.exe is present
+where.exe /Q cmd.exe
+IF NOT %ERRORLEVEL%==0 GOTO noWhere
+
+::Check for 7-Zip
+where.exe 7z.exe
+IF %ERRORLEVEL%==0 GOTO sevenZipIsInPath
+
+::Ok, WHERE can't find 7-Zip. Check at the default install location
+IF EXIST "C:\Program Files\7-zip\7z.exe" (
+	set zip="C:\Program Files\7-zip\7z.exe"
+	GOTO Package
+) ELSE (
+	echo.7-Zip was not found.
+	echo.Please download 7-Zip from http://7-zip.org/ and add 7z.exe ^(the command-line edition^) to PATH.
+	pause
+	goto :end
+)
+
+
+::WHERE command isn't found. Try it anyway.
+::(WHERE is present by default in Vista and newer, older Windows versions require that you install it yourself.)
+:noWhere
+echo.WHERE.exe was not found on your system.
+echo.If the script fails, please download 7-Zip from http://7-zip.org/ and add 7z.exe (the command-line edition) to PATH.
+
 
-::Prompt to download 7-Zip if necessary
-set dl7zfile=.windows_zip\Download 7-Zip.hta
-:retry
-if not exist .windows_zip\7za.exe cd .windows_zip&%hta% "%cd%\%dl7zfile%"&cd ..&goto retry
+::7-Zip command line is found in PATH
+:sevenZipIsInPath
+set zip=7z.exe
 
 
+:Package
 ::Pack Chrome extension
-cd drivers\chrome&&..\..\.windows_zip\7za.exe a -tzip -mx9 ..\..\wappalyzer-chrome.zip *
+cd drivers\chrome&&%zip% a -tzip -mx9 ..\..\wappalyzer-chrome.zip *
 cd..\..
 
 ::Pack Firefox extension
-cd drivers\firefox&&..\..\.windows_zip\7za.exe a -tzip -mx9 ..\..\wappalyzer-firefox.xpi *
+cd drivers\firefox&&%zip% a -tzip -mx9 ..\..\wappalyzer-firefox.xpi *
 cd..\..