From 3d5cea224b98bc3f57bc9cd966920550f4b00278 Mon Sep 17 00:00:00 2001
From: Sun Knudsen <hello@sunknudsen.com>
Date: Thu, 25 Feb 2021 15:00:00 -0500
Subject: [PATCH] Polished encrypted paper backup guide

---
 how-to-create-encrypted-paper-backup/README.md  |   2 +-
 .../qr-backup.sh                                |   6 +++---
 .../qr-backup.sh.sig                            | Bin 566 -> 566 bytes
 .../qr-clone.sh                                 |   2 ++
 .../qr-clone.sh.sig                             | Bin 566 -> 566 bytes
 .../qr-restore.sh                               |  14 ++++++++------
 .../qr-restore.sh.sig                           | Bin 566 -> 566 bytes
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/how-to-create-encrypted-paper-backup/README.md b/how-to-create-encrypted-paper-backup/README.md
index 1abf7b9..3f0bbcd 100644
--- a/how-to-create-encrypted-paper-backup/README.md
+++ b/how-to-create-encrypted-paper-backup/README.md
@@ -136,7 +136,7 @@ qr-backup.sh
 
 ### Restore encrypted paper backup
 
-> Heads-up: use `--split-words` to split secret into word list.
+> Heads-up: use `--word-list` to split secret into word list.
 
 ```shell
 qr-restore.sh
diff --git a/how-to-create-encrypted-paper-backup/qr-backup.sh b/how-to-create-encrypted-paper-backup/qr-backup.sh
index 0dbaec0..c6d8c93 100755
--- a/how-to-create-encrypted-paper-backup/qr-backup.sh
+++ b/how-to-create-encrypted-paper-backup/qr-backup.sh
@@ -89,7 +89,7 @@ if [ "$bip39" = true ]; then
   words=($secret)
   for word in ${words[@]}; do
     if ! exists $word; then
-      printf "$red%s$normal\n" "Invalid word $bold$word$normal"
+      printf "$red%s $bold%s$normal\n" "Invalid word" "$word"
       exit 1
     fi
   done
@@ -102,8 +102,8 @@ encrypted_secret_hash=$(echo -n "$encrypted_secret" | openssl dgst -sha512 | sed
 encrypted_secret_short_hash=$(echo -n "$encrypted_secret_hash" | head -c 8)
 
 printf "%s\n" "$encrypted_secret"
-printf "SHA512 hash: $bold%s$normal\n" "$encrypted_secret_hash"
-printf "SHA512 short hash: $bold%s$normal\n" "$encrypted_secret_short_hash"
+printf "%s: $bold%s$normal\n" "SHA512 hash" "$encrypted_secret_hash"
+printf "%s: $bold%s$normal\n" "SHA512 short hash" "$encrypted_secret_short_hash"
 
 echo -n "$encrypted_secret" | qr --error-correction=H > "$tmp/secret.png"
 
diff --git a/how-to-create-encrypted-paper-backup/qr-backup.sh.sig b/how-to-create-encrypted-paper-backup/qr-backup.sh.sig
index 613d2df7e7bbbefcaaab3520ca5b6e80799ae48d..7bbce087e546b4fa25d898416d15cbaebce3e776 100644
GIT binary patch
delta 542
zcmV+(0^$9(1hxc_BY!vm=Ku-`5Fe*!hAX`j1r9_H|78K!Vn*WdmOz|Ph0VQ9GxeRc
zA&9U4<|vP%KN<1>MhaFex_Rs39h2p0QanBY&UR(X^&QX9Wqc9aQkN+O)Y;5us|!kE
zK^k0H;?w2Dr#nKWa6Nc0hgf=8;P__&o{b+qap(n~!k1P1h<}s{xc^6IfieC4^aS*q
z(>6P2k%;hd*ZGQ%47SQu`f+*_V}fon&6XCk&fd<ac|r=G<QP6%#mw+=-w$+9T{=M9
z#P9t-p9};Zk;D>c3DGnzHIPXpny&g_bl4v?>RQ*On%a2mCygQJ1SVmC<q^ksX@(LH
zowtr-5N2P?!hhS_sdK4KxmQhaa_E|%2D34kN&ddsBh+={c8&zre%j{%;;30Z{52v@
z?QHK;+&ZJfH>Nd+!3EARqpWU2Aiuyde$ybLbO{NC0tP~9XFA#FGn+2OU1RgjA%HJ!
z|IK`m`fcMec6_YJT*>6u`k06;@wo${!ZTG}1_>aJ!GFn%c6VIE`rWHbzt#^N6)IVI
z$!;E61thNx^R`AkNxFBE>axK8s9_s~Xulz7zResl$Me{5dMf84#IZtS?h9VUj<pJ}
zBD}BI<Fksf9f~c%5v=JE0vbK)&psy3Gz?IDoy2y%tkTf;bHF%DCK7g}<=|I?cFO_9
gU@mmS!xs};jl2HkJY(#_gc`X+sRndxE!X}??VRBZ1poj5

delta 542
zcmV+(0^$9(1hxc_BY!vZcmN6s5Fe*!hAX`j1ulvY{xELR0?dSB^bb=Dvpbh8kU=Xb
zpRUJm;3S`2Q9cQcusYPyv0v|=T>q@#7!uiRy+XQ0vEfJlZNJ-eo8cq46rOG@Btb=(
zJb!2@`|0dCd42(6BG!1oZIE$|9-PtAT@3T8t|V<fWuUmU2Y(M?pmyfCtk5r8(Ryum
zV|~>7Hm!HQ4q64pQHSF{`G5LX!Mrv!k-Ec9mtt9jBF8(qxg{5n#T&w=fp}5(2r(&Q
znYwZn`1^l<@7hn(P>3PvRY>@rjr=e~X!*kA-dMkX8J8wxGecl0j?9~=V)z=UHd_yQ
zoWJG=ghgXHOMimGEyJ%TTG1g?25bn$8@PE!sD3Bpa`w1l20ZG^VRiP!!*!MO<97hx
zIV@SIn9n7L#AJjhpe-B8D+})uZ2^4U(p<E<7r6V9V8ITxgwq^Y&aD2+6RXWhOqM;?
zB;1eKhFpH>v0E?H*Tc872XNA{U{sX)-R<LKXdX0S5Pzjx11zO{XM!gREQah+A7Tt;
zG%5hp&=Q+rN&B@Jf=;ONej6+t0ERGu=-z@J9qC*MjUYeyeo~x-4QOi?72z+FcdSy|
z(pp%CpvR@YH0Q1Mvq^tmWAE5a4~7LdSl%}IJ{wJ2gQ~MHl2$T%!>873W#d2bu}iDl
g2^HTxqZgR!RE&h=N;qT?gkWV6%qBs1i{2IQ7kCZ@MF0Q*

diff --git a/how-to-create-encrypted-paper-backup/qr-clone.sh b/how-to-create-encrypted-paper-backup/qr-clone.sh
index 05aefd8..6a1945a 100755
--- a/how-to-create-encrypted-paper-backup/qr-clone.sh
+++ b/how-to-create-encrypted-paper-backup/qr-clone.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+tput reset
+
 printf "%s\n" "Restoring…"
 . qr-restore.sh
 
diff --git a/how-to-create-encrypted-paper-backup/qr-clone.sh.sig b/how-to-create-encrypted-paper-backup/qr-clone.sh.sig
index 9224164163ced3b07165738d955a8456cce69c1c..670a7385571f581b14b1ffc143377214211da1d8 100644
GIT binary patch
delta 542
zcmV+(0^$9(1hxc_BY!vm`2Y$D5Fe*!hAX`j1x!m1|5+BL;u;tza+tD5U2ImR(ewTW
zM?Bq93{GQMjKSa8(&9x`8Qt|kkNI7kYzR}!OSDu94Ml(4?$qz10kQMWk6qrXE9E&1
zOskGq+<E+8WBW;59mH<fmbLwngI>U%ph-Hq3-b{W1xHGdGk>srC=WXv9L5=OzwDjK
zBHcui;7l#)Bvy8P#UL-lWVra^yMSqSDeT+gq#*{niTMm6>(kV}SEk|G^bP6#&`#_B
zge0syPs#KRMyixz0krjV`lqSLeP9iC*i-{}JV6c-z0Qd{)9?_XUy1Q|hF|aTymEVA
zaI$1*_wfmn-hYz;O(-|2M(!AX#d%c-q%af_vHSPYW{=d@f%lcmS|@X{>>EI`^g*5R
zZscV6a+lgW&#Y8<q(-BOj&8NfY>yC_0A0tu#Q*!V5S>C$m$w$I1$=Bo9@Lmeij5ZV
zK`k|;!@39m=m1etYsaZr;r-3-X`7n3fJ9iy81KUG!GAyP+{Pjm)znkcM#q&*%>g~K
zdM(0Lca(tyl}cyu_uZiAem!i~>~x0Z$51?1jb*5yE_1g9a=W3V`2A3q4+iFI?bf7v
zr+uemP^~%nOWVXkFG8B#2ycqFMN|IlaC~%EQs4SeN>W(Suze5ff72xA<a<c`D@2~e
g_QH$}ofl8YJ<TwM3!NzQrovNf*bE`X;JsMi5(@(tf&c&j

delta 542
zcmV+(0^$9(1hxc_BY!vZg#Zc(5Fe*!hAX`j1r56o|3zRZy@ZaX$oWaTq;Uk|L(6}M
z1vbxI5}0|pOU-@s7Zw0<$aY?}t4{Q`;=pMb&RpEj{u>Wki98WWxWo(_n}zQTeOjnV
zYN)n6xcMxxM8G7G=IC+V-0nEQI#@`WV#LBL1vxXF#m23@D1XY>zW_$}b%eLkjHW&}
z9)+KAe($emMVSsQRyhLI;;tJ04+LU9_f_!8dqX@3-Kn$B!mi=xdw4zlpAr?3O!Y%s
zs)4-o=aVF--en_i3-0T{+yNFZ*D$>}6$P9hIBg7@?E%Fxen}-ql@$1)3j5qV1u=FX
zv2(Zfa~dipLVr*^n^ogx8J!T(tllhyoc<4jR`F!5%tItjFW~2Cx-``{(B?eS-E=m)
zv_{4fGQv+RHHcCW%O1{47pxD>;5GElNVt8&9(>wzd|cX6p}Id~KDE0QC{^laQ$g>C
zFk;7YMtUTRimg<WIiV3g<G5-upojWkg$%GBl}2STl7EP$E6gGfB?z!&5zD|;q#Yrh
zaK&#IHaiA@^D9-!CF{)kS<>^IQm`mgZhuBo9t{1l+7xV!Fq6qHS56lD(l310h2%v=
zXo`huN^oD_M{<oy$=vW^1M69~r;k1|c<~P)$40g42q<FcYnIK&mrLsYHM5s3A?kE^
gn7s<mI~Sqtw{0^Y2m@fAvkwI64E}cA*SgoNVSmU2djJ3c

diff --git a/how-to-create-encrypted-paper-backup/qr-restore.sh b/how-to-create-encrypted-paper-backup/qr-restore.sh
index 72a9b0e..07634ea 100755
--- a/how-to-create-encrypted-paper-backup/qr-restore.sh
+++ b/how-to-create-encrypted-paper-backup/qr-restore.sh
@@ -6,8 +6,8 @@ positional=()
 while [[ $# -gt 0 ]]; do
   argument="$1"
   case $argument in
-    --split-words)
-    split_words=true
+    --word-list)
+    word_list=true
     shift
     ;;
     *)
@@ -23,6 +23,8 @@ bold=$(tput bold)
 red=$(tput setaf 1)
 normal=$(tput sgr0)
 
+tput reset
+
 printf "%s\n" "Scan QR code…"
 
 data=""
@@ -45,8 +47,8 @@ encrypted_secret_hash=$(echo -n "$encrypted_secret" | openssl dgst -sha512 | sed
 encrypted_secret_short_hash=$(echo -n "$encrypted_secret_hash" | head -c 8)
 
 printf "%s\n" "$encrypted_secret"
-printf "SHA512 hash: $bold%s$normal\n" "$encrypted_secret_hash"
-printf "SHA512 short hash: $bold%s$normal\n" "$encrypted_secret_short_hash"
+printf "%s: $bold%s$normal\n" "SHA512 hash" "$encrypted_secret_hash"
+printf "%s: $bold%s$normal\n" "SHA512 short hash" "$encrypted_secret_short_hash"
 
 printf "$bold$red%s$normal\n" "Show secret? (y or n)? "
 
@@ -54,12 +56,12 @@ read -r answer
 if [ "$answer" = "y" ]; then
   secret=$(echo -e "$encrypted_secret" | gpg --decrypt)
   gpg-connect-agent reloadagent /bye > /dev/null 2>&1
-  if [ "$split_words" = true ]; then
+  if [ "$word_list" = true ]; then
     printf "%s" "Secret: "
     array=($secret)
     for i in ${!array[@]}; do
       position=$(($i + 1))
-      printf "%s" "$position.$bold${array[$i]}$normal "
+      printf "%d. $bold%s$normal " "$position" "${array[$i]}"
     done
     printf "\n"
   else
diff --git a/how-to-create-encrypted-paper-backup/qr-restore.sh.sig b/how-to-create-encrypted-paper-backup/qr-restore.sh.sig
index b8898bd3a325a6516fadb2eabfd32dd5fe8a8510..3419977d4b8f0d70eafe21438983b6508117b855 100644
GIT binary patch
delta 542
zcmV+(0^$9(1hxc_BY!vm-~b8<5Fe*!hAX`j1ybV=|6-zn+7Aq#c9kzjTr;y1zLJF8
zJa}OT$5PK&e+3d$dGsAcP9YnE=lS8SP#hGH6I<1PrA8NdwDawPVLIjnWF*P6*NgL)
z@gmL<eHT6W2=67y<^l1ETz*h?P%_nf3#PuVo~HxPAY#irpnnZQN3zK;DE?66i}{eV
zE>b%szI_kX^oAi>Q|v=)4tRssf13IG@FcbshY2IyqlrdQN_KHguTNC%dr#;$k9z{!
z9GSYKWP0R<3Ck1Yr+mHUy%N)i`%0xk*vRtUPCocfYm{(0i6$GNRkn{L|9?=~4#06z
z_KvoE*5Dwq>wm?B$72zM6{-mk1R5So0H`JuIn<f^4x*eweF@r~VeURd?n9aiO{j0W
zedsuKr(=<u`?Hw1=Z$o=4I<<~m@l=+go9N75E*N0L3y+Cp>?M_qsjcXi2$d)@cFWt
z-l51PLwSmV+9u$;iuWi+mMPbcqohFQ(R|K^fltfx#eW#U!pU_Qf2VN9G@fZJBqsk4
zd7MAKJ)~hCz?3Ukg8jL5^X(usum#VQb@xQTI*rzFJGJXUTt5B0+&R2;`L&9Q1G;3;
zIxyu#Ek2J|(7VqvK?MU$05eI3cuqEI*eyq{A?;yTjzm#k1;kqe5y+ZOlHY-3x!@w=
gu#xH|trs59x!x}o3|qF3@OIwP4Vc2!&bB8)kHu>V&;S4c

delta 542
zcmV+(0^$9(1hxc_BY!vZkpKz_5Fe*!hAX`j1)^XN|48!dMuJ-Ql+T>x)z#2TyKgxk
z6FBp`2HQay6n4?r?&Pzm1TF0H_tY_v4#yzl*|Y5n<4kzqy8J?ZiS#GW;$?$31Wje5
z38)*?>8h@fS&sBAaI5-xy1?hQlXtZu7NgR=w#jKAz)WV-!GCG6g3i2_Yo?pDR-l8f
z$t1hh<-FqJ;fs-@s^Z(t7;*`gv%^!0)?4|#!vWSno;w{ZQobLEJyhz&P3FlSx*|_X
z0b+vlpP=x3tCjzcV~;1z)1B4HP%t8X<z2Ynv>zsXf>t$$T;}f?>{mFraDcqY1I+KT
zAF(HczVrKwn}60MvnVdNGniPJgYQpSb~Wo)SI16SZ8>2ls6IA1++=M6uLOMwvL>hX
zX1EfzKFqjYs%;+_Dt!Xx-bl6|FVR`TK)9bNKemz*PW9Bg870-OF_~tcibn*Y05-MN
zWO%?E&WCNluzw3K9%YqVMK&OCWk^i3F)aVab0v!<PJa+YaQ50!rEKL(jW{ERs~r>D
z(qg7+R{P%Ld%@>!jG=<u<AHQUm6J2*qE1*Nalg_G>@z+Yk42SSHoKGF@Afoi!j&6~
z*oDaksgqymK$pZz;TNzWV#Z6qSuz*HK~MRVKW&*CXgET3P_#%t6v5<KKl*3(T+&Y|
gwV6!@Cl?*zvt!Z&mc16ZLkU&XZOjs<AFXi1mz<0cd;kCd