From 2df6588b53e58ec0ec3fdade3cc6af8238e0bc01 Mon Sep 17 00:00:00 2001
From: Sun Knudsen <hello@sunknudsen.com>
Date: Sun, 6 Jun 2021 10:41:15 -0400
Subject: [PATCH] Fixed regular expressions

---
 how-to-create-encrypted-paper-backup/pack.sh  | 11 +++++---
 .../pack.sh.sig                               | 26 +++++++++----------
 .../update.sh                                 |  4 +--
 .../update.sh.sig                             | 26 +++++++++----------
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/how-to-create-encrypted-paper-backup/pack.sh b/how-to-create-encrypted-paper-backup/pack.sh
index 903e42c..503c87b 100755
--- a/how-to-create-encrypted-paper-backup/pack.sh
+++ b/how-to-create-encrypted-paper-backup/pack.sh
@@ -12,6 +12,10 @@ bold=$(tput bold)
 red=$(tput setaf 1)
 normal=$(tput sgr0)
 
+dir_name=$(basename $1)
+dir_parent=$(dirname $1)
+archive="$dir_parent/$dir_name.zip"
+
 if [ ! -d "$1" ]; then
   printf "$bold$red%s$normal\n" "Update folder not found"
   exit 1
@@ -22,9 +26,10 @@ if [ ! -f "$1/run.sh" ]; then
   exit 1
 fi
 
-dir_name=$(basename $1)
-dir_parent=$(dirname $1)
-archive="$dir_parent/$dir_name.zip"
+if [[ ! "$dir_name" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}-pi-qr-update$ ]]; then
+  printf "$bold$red%s$normal\n" "Invalid update folder name"
+  exit 1
+fi
 
 rm "$archive" "$archive.sig" || true
 
diff --git a/how-to-create-encrypted-paper-backup/pack.sh.sig b/how-to-create-encrypted-paper-backup/pack.sh.sig
index e051b48..d628bee 100644
--- a/how-to-create-encrypted-paper-backup/pack.sh.sig
+++ b/how-to-create-encrypted-paper-backup/pack.sh.sig
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEqYzNEiJDZVsm+vthH6dnhiu9EwUFAmC81rkACgkQH6dnhiu9
-EwW/lRAArCK9GkGcQykBlZnHyNk5xjbKPTcF9dAcuKWmbJzwJwMgD09nQz4jKTuD
-WQKkeE4S2MMEgDSwh11Oo5UKvavMjClg4pOAXDYFmrfo5cwTUeHFXcjp1ECQkF56
-iGNRRXlPmT7G/kuvNmysZtpzSC9YFb6Nu9Cz7kigXJ0uAaljycnWrbtBb+LvPn+n
-GrBz8gsjRAAWrJZdv9CaplqAVaGNeC2RxFOdhvFPo21hZ2Pabaw/gRcQqCHazPoa
-s4x/HGEcZSXLyj8spA8/82sZoZBBWi5qrE2Fra+aG2vBAMwf/0WXf45Y9itdnSB1
-2dYKC8XlK3wCJQNnhOpPZrw2nOEDXp+2WIe2boOXWWu5qhlRA7AEdpoUJzGYxYFg
-CeUmPY4VWdzHtHn+snw3VXP/F8KRVzoIWUn918gDFU81+dV5GvQhkoIalCxR5mmy
-X89nPkhxXXQoyQM9p4+F5EPtzTptHPq4UhG/2ZC1WswIjZfVvZUus4RBInZxDQDC
-f7GNEHUDQtVBJnr40WAPB4qLZV0EmbKsGOofix5MU39TFJXUNbClL06Mx5pcfRXd
-JiNDxWDqgUsbaDQYexUh45d/6Fs4T6nFXJfSHwswXkDjt18JAgYF3fOVm/NgtSUO
-r72kjIbDoN0qogciOPLnukHkdnN+WodP0ofhx2tqNXLhjdhq+HY=
-=HYaf
+iQIzBAABCgAdFiEEqYzNEiJDZVsm+vthH6dnhiu9EwUFAmC83VIACgkQH6dnhiu9
+EwXLrg/+Oj29XPs4RGBSaefcUBiaCQidFLj6Uwu2SyeMeJc7Hjsynl5RyHykJU4o
+btbPj9tiufbO+4guhpw4KaJWlhbReXEIkWtYhDjL+JPireim4Yj0QaZBS7cZj3WS
+/KUdbiKDqw7K/vIKKCwAmn26NUx+2gBzkw0KhdhnTGTS7wTmPutW+YQ00W8hUDTi
+vIL6F7XNm7GequimJhwIiMasbB1jKHyvlr8M9PE6Wnmjqy4e/bxmOJPWT7vMdKW+
+kS4DWWG5Hk+1gYnShJiBF5VFdThBDpuPHyI5N6LYxgpcdpRIvcsRtA0HgXcod/fN
+Ez9eDDbfm+O2TuXTlseqSkNfjpGh8KdP350jBCu+IBKQArjAHMo6W4Opsh1+A0Xn
+iqLcG9ZCyBzvOM0trNJGpebSMhUrUj8tlp4fjX78lqJtcS/NOR/6mBfDEG7DlU+W
+y+UW8NkdRAmGecn6tESVedj2tkvJexmCb9p8PZTKirh+8pLbGJeQbUPYoZGo0rig
+dYf5AGdApZQtRI/w2K/x5PviykkC2Mz5DF8IbgIru3/0uWt5Lk75bh6GCGSnxsaW
+jXoA9k8ugfdH96tASLRqWYu1b9jUpcF2iI5IVcuoLkTal9cJsjLiRmLqmW1I+T0u
+KKGsVNWJMvdbDF25u/0ek1yHEi8vbIQS1MDMddkUN9kszNjL0S4=
+=ms2i
 -----END PGP SIGNATURE-----
diff --git a/how-to-create-encrypted-paper-backup/update.sh b/how-to-create-encrypted-paper-backup/update.sh
index 5b8d4bf..8a72f5b 100755
--- a/how-to-create-encrypted-paper-backup/update.sh
+++ b/how-to-create-encrypted-paper-backup/update.sh
@@ -39,7 +39,7 @@ fi
 printf "$bold%s$normal\n" "Please type current date (ISO 8601 format) and press enter"
 read -r current_date
 
-if [[ "$current_date" =~ ^\d{4}-\d{2}-\d{2}$ ]]; then
+if [[ ! "$current_date" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
   printf "$bold$red%s$normal\n" "Invalid date"
   exit 1
 fi
@@ -49,7 +49,7 @@ sudo date --set="$current_date"
 
 gpg --import /home/pi/sunknudsen.asc
 
-update=$(ls -t $usb/pi-qr-update-*-*-*.zip | head -1  || echo "")
+update=$(ls -t $usb/*-*-*-pi-qr-update.zip | head -1  || echo "")
 
 if [ -z "$update" ]; then
   printf "$bold$red%s$normal\n" "Update archive not found"
diff --git a/how-to-create-encrypted-paper-backup/update.sh.sig b/how-to-create-encrypted-paper-backup/update.sh.sig
index 84ceb1b..1de1b3d 100644
--- a/how-to-create-encrypted-paper-backup/update.sh.sig
+++ b/how-to-create-encrypted-paper-backup/update.sh.sig
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEqYzNEiJDZVsm+vthH6dnhiu9EwUFAmC8zeQACgkQH6dnhiu9
-EwURXA//Yb7dCnTa4lkoi5MlJnmfoIxtpd8GhLr0CxQZc4ocQt3aO8rUiQ62gwcS
-ocjKlb0v/4XVyP/KZxHmaoMjJJr5bNEBeJTJjMaN+0/QY8eQ+3eYjcr5QGsrVQCq
-FzpKYMd2zyHFRshsvHlwPlkTK/hA++cyNYcMGZJDX7RMvl3Z8+XkECgjs2Z0QDhq
-h8hg1/wvJoVeLxC8qmFnM1c0tBIa7xpfJYZmsPIgVHK0o4EykLInGqrNpsYcIgQv
-869WWBrnQylpnIcA25QkfTOS2CXJxaMA7CcG79Ooh6I8Rwgl9PbzogLY2o2Z1W96
-r+0E5DdKqGgD500hoYCRRUftCc/aHZKqD60aktWhXUivLvD0QU5CvRT/1RcHvghB
-+9SKh202jY45ixgyQqWYuIfIn2s/51tCFBu4D5Qf8t1WiKmYDZF261tDx4KlnGTG
-WVqwS0YzZPBL1fmzW/3O9OaC/xlO+4u6WHFXnleOdAddyXiW1e+Ev0/xOzcQdT1o
-n4n5Qh1gJZcJHVM5X8qVTDmUGTVVTP0hqfGv15pYkTTVYnoInuOE2riXmaVjPumV
-1Yo2YoC5oQ68BsWKCPy81fequMoxD0dkiBkloY9j2u/i9QyLucejOKWgWGcUNF5V
-VGAgs244VuUdKD1IMcQrEEvakyd+snY2cb+jQiOAqoeh+PLyte4=
-=7s6E
+iQIzBAABCgAdFiEEqYzNEiJDZVsm+vthH6dnhiu9EwUFAmC83VoACgkQH6dnhiu9
+EwUBDg//chGKJ4jOAb1gJfFk5tsz+ePSwNCCjt2NQY4uql/dg9DlBS2eKbw8DOA2
+V9Ykcptn94pNYBYRRfk11qTMPb7Mm4LDccZY94ghSAvxs6uJYt7feU7nw99QGyHZ
+ujKqfXMW1di5cJ/8yb/B3qnSVDSQiQ9gGesAMATwJnxmD0W3Q+sf/8V8/CF1rWlZ
+Xr5ktbQv5nSeJ4msrPGBlV9pJ7pYitnSc2HKdh2e+uPWapVY3Pquey2COx3qfI55
+vNqS/zB7R9GA7MbVd5tZEZhPTp9PBNLXtBFsxCNud1Lcq7JynuTeoRCdmYl7nZr7
+m2uxCcvws6YWJxO6LsNJrWaN8sjLYMp/EvgCTwolg8hXvmEnwYLnRovKGDWMsDgG
+KN2nXhqXOvAIx35YgYMPgQ3aNdp1lrw1UpBWh8RC2pKFiUyI11pCqRIydShPxPLk
+Vam0NBsWUhurw/kdKPzS9xnV+KAdfZtlffKVFFJ9pVCoW8Nd74DP/cEYEKw2ULyB
+rDyVNTehnMj6dAEcGMMuR5VegLwBTDXM3qgtUAWs0uI5cUVoBjHlnzmcxK1DJebf
+3Al4cpHyhqDTtMc/6PKO2drnLEsQRu9F8lL6CVyIugjuFqhCtUwbCsdOBM1V5pxl
+XMnyx98qM1tNCRQ8j0lH5pWM1gnUQHqkJBCQACH8TgXQEjsBO+I=
+=uYDp
 -----END PGP SIGNATURE-----