From 57c60d9ac6afa2b499b9182c26ed8d267a92c72d Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Mon, 14 Sep 2020 18:34:28 -0700
Subject: [PATCH] doc: wikiparser: Use icons from the icons directory

Currently some icons are duplicated between the images/ directory and
images/icons/ directory. De-duplicate and only use the icons from images/icons
directory.

Tests:

- Affected sections/pages of the manual are: Firewall, Hardware and VirtualBox.
Confirm by diffing with manual generated without the code changes.

- Open all affected pages and the full manual page and confirm that images are
loading properly.

- Check all affected pages and the full manual page in FreedomBox interface and
confirm that images are loading properly.

- Check all affected sections in the generated PDF.

- Repeat tests for English and Spanish manuals.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 doc/manual/en/images/checkmark.png  | Bin 589 -> 0 bytes
 doc/manual/en/images/icon-error.png | Bin 820 -> 0 bytes
 doc/manual/en/images/star_off.png   | Bin 738 -> 0 bytes
 doc/manual/en/images/star_on.png    | Bin 758 -> 0 bytes
 doc/manual/es/images/checkmark.png  | Bin 589 -> 0 bytes
 doc/manual/es/images/icon-error.png | Bin 820 -> 0 bytes
 doc/manual/es/images/star_off.png   | Bin 738 -> 0 bytes
 doc/manual/es/images/star_on.png    | Bin 758 -> 0 bytes
 doc/scripts/wikiparser.py           |   4 +++-
 9 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 doc/manual/en/images/checkmark.png
 delete mode 100644 doc/manual/en/images/icon-error.png
 delete mode 100644 doc/manual/en/images/star_off.png
 delete mode 100644 doc/manual/en/images/star_on.png
 delete mode 100644 doc/manual/es/images/checkmark.png
 delete mode 100644 doc/manual/es/images/icon-error.png
 delete mode 100644 doc/manual/es/images/star_off.png
 delete mode 100644 doc/manual/es/images/star_on.png

diff --git a/doc/manual/en/images/checkmark.png b/doc/manual/en/images/checkmark.png
deleted file mode 100644
index 2fd38192c018d8f42fec582de514c24f11feb628..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RS0u&NDEN+L;8vp<S?@2^KR5*>Llgn!pQ543%J2RPPnrTYR
z8zoH)3cBc~2)Yrs;vy{~U5I-@L|oXFgiFOm3*t&~<6od)N<k622)Gjwbk_%Vv`I~C
zYsO4wGR@7s*M&r)#2E4H&g*x+bKn5~Y2;sO3&pJH4J^%DL>abwhUTt}Ma<@f*>gBN
zk@QqWT?Bxk0GDnaF^Hnvo18jkI^SIERQFg5<nGV_5z%i&lVQV*7<m6?waJ;d{eo^Z
zh62pce1b#H<xZqSpDR0XY}dBciAUYM_BR00<U%qX(MUjG?cG*W2!6dx%bjk1pn?L;
zoRmV&#<S+gw)I7_Hd`-ItJGVg0YIUcmA~w)$f;%e@vWw+4`LZpXTnEyquvq%SAQS!
zLxEJT>4xIw&x|8=d{k<LEKk$yGzd<G5{kNOH9CM?DbdZ>eE~~%K0M?H^40!k>%fc!
zh#AulNr7kaoDmXCqQ31j!R3v9YyP}}3U;}%%N)<{Af5{b<41!s6b)d1%lD-uk4x0D
z1_GYY%2y6ttgU$-=fHSsgfNf8*<+0Py!fX>tG&)@*{<YIhofzmPlgkEptkOLZk;ba
zU-+~FK=uRlKGP_Gl%^qdelGJ=(Udd*yu4pI>pPt)fEoaA5TL7Q41fth2hax41mFPR
b{S<r$_ov05T$eQ-00000NkvXXu0mjfl}rrP

diff --git a/doc/manual/en/images/icon-error.png b/doc/manual/en/images/icon-error.png
deleted file mode 100644
index ab6808fba55428710250c72b2569ca5288cd6df2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)d~?8Ee&hHoWKA80>Mc{
zK~y-)ZIioCQ(+i~pL6L2ZH>mr;3bB}Kr47@YPbohHi(*-khrlBSo{xMIye|<92`s>
zj0<tl!MicIm{25|u!zCL4h|@_)D}u<p$Fl#=R2PRrGoM%U%uo`p5J@<<yF`ckHTR+
zJu&e_z*Tk#4aNjqjzVQKr~CsyYxMapUA%V9t!NqmQc4g4X<2-D_|W_^GxJ`+l_*#>
zfhzpM@ALIWhKAhp<Kvk5{I=>&ub29c4n916Y9^A&F#&y1u(Xj-$dR3#d>J@)tT!?^
zxB;)Of@N(J5UR>rI!z!F(O2i@jx3c*X9mOJ=UQhb^X7PCW6$}40e3bY$EvSKkHsLF
zL}s%av!6J@-n)0HBoY{3zj8br){Ru^=#NAqsP(Ao<NoW{^~}3>lnVvazCP5J7L<+-
z`2HPr|9<ui598Xm4@F8!<Kz4;6le~I^{LOF1G=IpASLBOVWZWN5pcP1_4eYvaRXgZ
zaC$tL@i_TAcd&tV!$1mw0;vCaB_-niedN>>&Rx53dc9cF)8t|?gl%I3HXy4zQg`&b
zxfypTgs$s291eB|gVcpW$SN$#WyIXvUjZpZ4OUxP@ZP$G)9YnD9%prQ6sO07@7_H;
z?d_Pk9LBeA$dwfUbSdSAnqeR;i@LTpTvd2+co^F>(SQT}{nVX0#rlH>plR6EqS^&1
zyDP=w;XqrPR!Sr&y?#yQ=T8=H-lUw#P+nXl_v#gEv$G^`-$v0ie11Rar6v2v@^W5@
zfm4IGCmR~NTZ2JYDjsL8Sgb8;>r)&K8k(9&7YgEII=x^+r#1#60#9<qVwY(chXSpw
zdTD;1ifL|xRfmHHzn|HBUQGV_m9n8d3aQ#LZFb^6c(D8I>C-Mn2yDwjT2}2(B$L*s
yY<9+mt|%;SyT+{|0(y3`SA}UC&P8E)GxrC_O;YyPhW8Wz0000<MNUMnLSTXtP<Dd=

diff --git a/doc/manual/en/images/star_off.png b/doc/manual/en/images/star_off.png
deleted file mode 100644
index 2f99caea53e14032a2ba977a3bcfa0b53ef83d7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOG-
z2^s=f!NWHI00Lr3L_t(I%Z*aON*hrWJ@37FLm5O@sY4<}YfurDE`-{J8(nAxrQN!9
z;U~l>SyTwdPY~N>3`I(do9uMuqFtI@glZ9WG650E1kJp;x2puD5xj8W!aMi8b2&%g
znaXCfDQ5l+;64n)_uJdse>>sia|Fzsotc^GnVXw)wbq-@;W`qO%Vi;iSR5G{k%NPS
zLI|-~E|<lN35vzyq~kaaGlQAoIF3^+7AId!Af;RyA0JnZMgu_*U~FtmNhy~)VMR8Z
z{Y*p|X4a1%mY0{&QXr+o-rioPk2b~n`g*jwx+=BSXf~S=LO>}6B0{xV1redQw--VP
zFf#zawrzxAh@G7sl1i!4(b3TZ01y#;--qw}s8*|O1s4|=xV*f?)zuZkFa$H>@bK_K
zDOFMv6BFMXjYjO`<m7EKnN+b@4E1^)Q51ohVT@^?kw_$Pb900J{r#rz`(JKvZ&%vZ
zY;0_N0PtgadRnDYDa-S`Rvth^h{xkNJv}wY$Hx(XPq|#K^u&c+E>|L=e63a^0EnXK
zNdrKwRwE+Hx0e62Q7JV$G&E$_>vd?Y5s$}_NF<=O#@*c=hKGl3rPOT49Hi6f9%i0$
zT^9h**Vl(irD7_Tib*DukW#{RT`==hI-Txm?OE-?vgQW{212d1)!p5VgM)+n>+5SD
z0M5?NUN0;xys~W@{r&yn`T6-gfNxI}F!N|vSC<Zg0EI%K>3QC+F(ze<NqL^PTPPHo
zK@h-k9L>z5?IgB_wY9Z3mSz27W=TXVTU%Q{AK#kEWIjqMzX~D981pWl&;J2{fAxql
UmV+7zZ2$lO07*qoM6N<$f+~JNssI20

diff --git a/doc/manual/en/images/star_on.png b/doc/manual/en/images/star_on.png
deleted file mode 100644
index 6a64f936c64be00f17c054bc30b95fe53c004348..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOS{
z6*d)vDZ1wX00MSNL_t(I%axK#NR(j|hM({I|Cw<#FmW;)C?bu-R$ZXNE_MT5bfX{$
zLM*pYi#8E0x)9Z-T@ZG$3v?mMHrYamG_6c&QB(^XE2U^=%FJ?p|9`&kv?xVMq2A4T
z;d{?H-^+Uxlc4<yr6Q_BfhWE!tEl7sL^?g$04w^?yo!_gWtH{C64pofABdpZuIR7w
z2fsP$pMTKaz~V@>I2Xx)WQatIbK4tO{O=YVHpa_#ICl6s*6SiZZ@YuT#)+ir$z^@m
zh#U}+(AbAXn_CE}*N6ld=F{1@`tR+UBeXSOjGqz_5#xUp6MPbDhQwz3BuMWSKUpW%
zPlySUV*EZa{)a!>l(aQqT;(`TJx^-am8`fMLDHD-SJ66(*fdBMWEelaAJh~8+^KuO
zjgxr1b67bv>u>#LYx3Q_a~(Gdd~Yy;J9QsohY<7QceTSH0iX%Tj^Pa^=(t(nr+V(6
z`_|9a(P$oBq8iklxl0Z@vDw?)Z2wU}5D5_L5iUGVs^?a=``IZ2vSoP<P2*BnUPF^u
zIWd@iWdW@Di8VhE^AoWd1jXRjH&(2i7-{}1M(sFji%K?yO{Nv)6cH{wN;q~L<-{>V
z512k@Ls&a%?SyyGd6s-cmgdFQ0};a0PLoPp%O(@ovytg%K;@7Zt44&SooC4(>2pVj
zmqS%-)~Z0eGhB(T;Z<{`H}Lso65va3b5U94?HnD76Pvj*NcTRh0&a}AAe86i6@;>x
zZn_#5_yfro^$|}>Bc7BFBwyBdH7@jn%v(ay+z>+f=p~Mj)(gzhE>97(vFu)1OXFCt
oEf?ABXwIXsHp`L~yGQ{10$3zHoxun*ng9R*07*qoM6N<$f>IMu7XSbN

diff --git a/doc/manual/es/images/checkmark.png b/doc/manual/es/images/checkmark.png
deleted file mode 100644
index 2fd38192c018d8f42fec582de514c24f11feb628..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RS0u&NDEN+L;8vp<S?@2^KR5*>Llgn!pQ543%J2RPPnrTYR
z8zoH)3cBc~2)Yrs;vy{~U5I-@L|oXFgiFOm3*t&~<6od)N<k622)Gjwbk_%Vv`I~C
zYsO4wGR@7s*M&r)#2E4H&g*x+bKn5~Y2;sO3&pJH4J^%DL>abwhUTt}Ma<@f*>gBN
zk@QqWT?Bxk0GDnaF^Hnvo18jkI^SIERQFg5<nGV_5z%i&lVQV*7<m6?waJ;d{eo^Z
zh62pce1b#H<xZqSpDR0XY}dBciAUYM_BR00<U%qX(MUjG?cG*W2!6dx%bjk1pn?L;
zoRmV&#<S+gw)I7_Hd`-ItJGVg0YIUcmA~w)$f;%e@vWw+4`LZpXTnEyquvq%SAQS!
zLxEJT>4xIw&x|8=d{k<LEKk$yGzd<G5{kNOH9CM?DbdZ>eE~~%K0M?H^40!k>%fc!
zh#AulNr7kaoDmXCqQ31j!R3v9YyP}}3U;}%%N)<{Af5{b<41!s6b)d1%lD-uk4x0D
z1_GYY%2y6ttgU$-=fHSsgfNf8*<+0Py!fX>tG&)@*{<YIhofzmPlgkEptkOLZk;ba
zU-+~FK=uRlKGP_Gl%^qdelGJ=(Udd*yu4pI>pPt)fEoaA5TL7Q41fth2hax41mFPR
b{S<r$_ov05T$eQ-00000NkvXXu0mjfl}rrP

diff --git a/doc/manual/es/images/icon-error.png b/doc/manual/es/images/icon-error.png
deleted file mode 100644
index ab6808fba55428710250c72b2569ca5288cd6df2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)d~?8Ee&hHoWKA80>Mc{
zK~y-)ZIioCQ(+i~pL6L2ZH>mr;3bB}Kr47@YPbohHi(*-khrlBSo{xMIye|<92`s>
zj0<tl!MicIm{25|u!zCL4h|@_)D}u<p$Fl#=R2PRrGoM%U%uo`p5J@<<yF`ckHTR+
zJu&e_z*Tk#4aNjqjzVQKr~CsyYxMapUA%V9t!NqmQc4g4X<2-D_|W_^GxJ`+l_*#>
zfhzpM@ALIWhKAhp<Kvk5{I=>&ub29c4n916Y9^A&F#&y1u(Xj-$dR3#d>J@)tT!?^
zxB;)Of@N(J5UR>rI!z!F(O2i@jx3c*X9mOJ=UQhb^X7PCW6$}40e3bY$EvSKkHsLF
zL}s%av!6J@-n)0HBoY{3zj8br){Ru^=#NAqsP(Ao<NoW{^~}3>lnVvazCP5J7L<+-
z`2HPr|9<ui598Xm4@F8!<Kz4;6le~I^{LOF1G=IpASLBOVWZWN5pcP1_4eYvaRXgZ
zaC$tL@i_TAcd&tV!$1mw0;vCaB_-niedN>>&Rx53dc9cF)8t|?gl%I3HXy4zQg`&b
zxfypTgs$s291eB|gVcpW$SN$#WyIXvUjZpZ4OUxP@ZP$G)9YnD9%prQ6sO07@7_H;
z?d_Pk9LBeA$dwfUbSdSAnqeR;i@LTpTvd2+co^F>(SQT}{nVX0#rlH>plR6EqS^&1
zyDP=w;XqrPR!Sr&y?#yQ=T8=H-lUw#P+nXl_v#gEv$G^`-$v0ie11Rar6v2v@^W5@
zfm4IGCmR~NTZ2JYDjsL8Sgb8;>r)&K8k(9&7YgEII=x^+r#1#60#9<qVwY(chXSpw
zdTD;1ifL|xRfmHHzn|HBUQGV_m9n8d3aQ#LZFb^6c(D8I>C-Mn2yDwjT2}2(B$L*s
yY<9+mt|%;SyT+{|0(y3`SA}UC&P8E)GxrC_O;YyPhW8Wz0000<MNUMnLSTXtP<Dd=

diff --git a/doc/manual/es/images/star_off.png b/doc/manual/es/images/star_off.png
deleted file mode 100644
index 2f99caea53e14032a2ba977a3bcfa0b53ef83d7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOG-
z2^s=f!NWHI00Lr3L_t(I%Z*aON*hrWJ@37FLm5O@sY4<}YfurDE`-{J8(nAxrQN!9
z;U~l>SyTwdPY~N>3`I(do9uMuqFtI@glZ9WG650E1kJp;x2puD5xj8W!aMi8b2&%g
znaXCfDQ5l+;64n)_uJdse>>sia|Fzsotc^GnVXw)wbq-@;W`qO%Vi;iSR5G{k%NPS
zLI|-~E|<lN35vzyq~kaaGlQAoIF3^+7AId!Af;RyA0JnZMgu_*U~FtmNhy~)VMR8Z
z{Y*p|X4a1%mY0{&QXr+o-rioPk2b~n`g*jwx+=BSXf~S=LO>}6B0{xV1redQw--VP
zFf#zawrzxAh@G7sl1i!4(b3TZ01y#;--qw}s8*|O1s4|=xV*f?)zuZkFa$H>@bK_K
zDOFMv6BFMXjYjO`<m7EKnN+b@4E1^)Q51ohVT@^?kw_$Pb900J{r#rz`(JKvZ&%vZ
zY;0_N0PtgadRnDYDa-S`Rvth^h{xkNJv}wY$Hx(XPq|#K^u&c+E>|L=e63a^0EnXK
zNdrKwRwE+Hx0e62Q7JV$G&E$_>vd?Y5s$}_NF<=O#@*c=hKGl3rPOT49Hi6f9%i0$
zT^9h**Vl(irD7_Tib*DukW#{RT`==hI-Txm?OE-?vgQW{212d1)!p5VgM)+n>+5SD
z0M5?NUN0;xys~W@{r&yn`T6-gfNxI}F!N|vSC<Zg0EI%K>3QC+F(ze<NqL^PTPPHo
zK@h-k9L>z5?IgB_wY9Z3mSz27W=TXVTU%Q{AK#kEWIjqMzX~D981pWl&;J2{fAxql
UmV+7zZ2$lO07*qoM6N<$f+~JNssI20

diff --git a/doc/manual/es/images/star_on.png b/doc/manual/es/images/star_on.png
deleted file mode 100644
index 6a64f936c64be00f17c054bc30b95fe53c004348..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOS{
z6*d)vDZ1wX00MSNL_t(I%axK#NR(j|hM({I|Cw<#FmW;)C?bu-R$ZXNE_MT5bfX{$
zLM*pYi#8E0x)9Z-T@ZG$3v?mMHrYamG_6c&QB(^XE2U^=%FJ?p|9`&kv?xVMq2A4T
z;d{?H-^+Uxlc4<yr6Q_BfhWE!tEl7sL^?g$04w^?yo!_gWtH{C64pofABdpZuIR7w
z2fsP$pMTKaz~V@>I2Xx)WQatIbK4tO{O=YVHpa_#ICl6s*6SiZZ@YuT#)+ir$z^@m
zh#U}+(AbAXn_CE}*N6ld=F{1@`tR+UBeXSOjGqz_5#xUp6MPbDhQwz3BuMWSKUpW%
zPlySUV*EZa{)a!>l(aQqT;(`TJx^-am8`fMLDHD-SJ66(*fdBMWEelaAJh~8+^KuO
zjgxr1b67bv>u>#LYx3Q_a~(Gdd~Yy;J9QsohY<7QceTSH0iX%Tj^Pa^=(t(nr+V(6
z`_|9a(P$oBq8iklxl0Z@vDw?)Z2wU}5D5_L5iUGVs^?a=``IZ2vSoP<P2*BnUPF^u
zIWd@iWdW@Di8VhE^AoWd1jXRjH&(2i7-{}1M(sFji%K?yO{Nv)6cH{wN;q~L<-{>V
z512k@Ls&a%?SyyGd6s-cmgdFQ0};a0PLoPp%O(@ovytg%K;@7Zt44&SooC4(>2pVj
zmqS%-)~Z0eGhB(T;Z<{`H}Lso65va3b5U94?HnD76Pvj*NcTRh0&a}AAe86i6@;>x
zZn_#5_yfro^$|}>Bc7BFBwyBdH7@jn%v(ay+z>+f=p~Mj)(gzhE>97(vFu)1OXFCt
oEf?ABXwIXsHp`L~yGQ{10$3zHoxun*ng9R*07*qoM6N<$f>IMu7XSbN

diff --git a/doc/scripts/wikiparser.py b/doc/scripts/wikiparser.py
index 4f49db34f..17a7aeccb 100755
--- a/doc/scripts/wikiparser.py
+++ b/doc/scripts/wikiparser.py
@@ -553,7 +553,9 @@ def map_local_files(path):
     if 'target=' in path:
         path = path.partition('target=')[2]
 
-    if '/' in path:
+    if path.startswith('icons/'):
+        pass
+    elif '/' in path:
         path = path.rsplit('/', maxsplit=1)[1]
 
     return f'images/{path}'