From fb8c775598868f657309c37ba650fda52e813da7 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sat, 26 Aug 2023 21:50:48 -0500
Subject: [PATCH 01/47] add shutdown

---
 raspberrypi/optimize_shutdown.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 raspberrypi/optimize_shutdown.sh

diff --git a/raspberrypi/optimize_shutdown.sh b/raspberrypi/optimize_shutdown.sh
new file mode 100644
index 0000000..1a24852
--- /dev/null
+++ b/raspberrypi/optimize_shutdown.sh
@@ -0,0 +1 @@
+#!/bin/sh

From eb1be4cbc44f5bf291cfddefa5370a728da4e41f Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sat, 26 Aug 2023 21:51:57 -0500
Subject: [PATCH 02/47] add power

---
 raspberrypi/optimize_power.sh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 raspberrypi/optimize_power.sh

diff --git a/raspberrypi/optimize_power.sh b/raspberrypi/optimize_power.sh
new file mode 100644
index 0000000..829303e
--- /dev/null
+++ b/raspberrypi/optimize_power.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+

From 8c2aa3fdbac00c71d09fd12883a96c9d35cde5a2 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 00:49:44 -0500
Subject: [PATCH 03/47] add power script

---
 raspberrypi/optimize_power.sh | 2 ++
 1 file changed, 2 insertions(+)
 mode change 100644 => 100755 raspberrypi/optimize_power.sh

diff --git a/raspberrypi/optimize_power.sh b/raspberrypi/optimize_power.sh
old mode 100644
new mode 100755
index 829303e..1d59715
--- a/raspberrypi/optimize_power.sh
+++ b/raspberrypi/optimize_power.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 
+sudo sed -i ' 1 s/.*/& vt.global_cursor_default=0/' /boot/cmdline.txt || { echo "Error: Failed to modify cmdline.txt."; exit 1; }
+
 

From 930dc86b9e616d50d131a9f7d73d29a0ed2d455c Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 00:56:34 -0500
Subject: [PATCH 04/47] add shutdown script

---
 raspberrypi/optimize_shutdown.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/raspberrypi/optimize_shutdown.sh b/raspberrypi/optimize_shutdown.sh
index 1a24852..efba3fd 100644
--- a/raspberrypi/optimize_shutdown.sh
+++ b/raspberrypi/optimize_shutdown.sh
@@ -1 +1,3 @@
 #!/bin/sh
+
+echo "kernel.printk = -1 -1 -1 -1" > "/etc/sysctl.d/20-quiet-printk.conf" || { echo "Error: Create '/etc/sysctl.d/20-quiet-printk.conf'."; exit 1; }

From 0354ef7a57cbdba6049aa132b2f52067662b7bcf Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:00:13 -0500
Subject: [PATCH 05/47] add optimize

---
 raspberrypi/optimize.sh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 raspberrypi/optimize.sh

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
new file mode 100755
index 0000000..ba00683
--- /dev/null
+++ b/raspberrypi/optimize.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+curl -s https://raw.githubusercontent.com/dezren39-dev/dezren39/optimize/raspberrypi/optimize-startup.sh | bash
+curl -s https://raw.githubusercontent.com/dezren39-dev/dezren39/optimize/raspberrypi/optimize-power.sh | bash
+curl -s https://raw.githubusercontent.com/dezren39-dev/dezren39/optimize/raspberrypi/optimize-shutdown.sh | bash

From 3f9e2a8057930196324747b1929d1b3268a80fde Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:03:35 -0500
Subject: [PATCH 06/47] beepy

---
 raspberrypi/optimize.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index ba00683..cd78c67 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-curl -s https://raw.githubusercontent.com/dezren39-dev/dezren39/optimize/raspberrypi/optimize-startup.sh | bash
-curl -s https://raw.githubusercontent.com/dezren39-dev/dezren39/optimize/raspberrypi/optimize-power.sh | bash
-curl -s https://raw.githubusercontent.com/dezren39-dev/dezren39/optimize/raspberrypi/optimize-shutdown.sh | bash
+curl -s https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-startup.sh | bash
+curl -s https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-power.sh | bash
+curl -s https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-shutdown.sh | bash

From b4e3694ebeaceb1f201d254a46369e89c26d91bd Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:04:59 -0500
Subject: [PATCH 07/47] x

---
 raspberrypi/optimize_shutdown.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 raspberrypi/optimize_shutdown.sh

diff --git a/raspberrypi/optimize_shutdown.sh b/raspberrypi/optimize_shutdown.sh
old mode 100644
new mode 100755

From 4d995f1cc667ce26a36f2c6954f9d112c6f3279f Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:07:12 -0500
Subject: [PATCH 08/47] quot

---
 raspberrypi/optimize.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index cd78c67..06ec16d 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-curl -s https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-startup.sh | bash
-curl -s https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-power.sh | bash
-curl -s https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-shutdown.sh | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-startup.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-power.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-shutdown.sh" | bash

From 6e17c60ab238aa1d62ea06d546bc10237bc63846 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:10:41 -0500
Subject: [PATCH 09/47] _

---
 raspberrypi/optimize.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 06ec16d..35d4788 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-startup.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-power.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize-shutdown.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_startup.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_shutdown.sh" | bash

From e50eedc04f4a8501b77146254a10de0d819667f2 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:11:54 -0500
Subject: [PATCH 10/47] boot

---
 raspberrypi/optimize.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 35d4788..97540d9 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_startup.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_boot.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_shutdown.sh" | bash

From 87c5ac51477801df5478eb3e0049a7ef039709b4 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:56:59 -0500
Subject: [PATCH 11/47] optimize motd

---
 raspberrypi/default-motd.sha256    |  1 +
 raspberrypi/optimize_motd.sh       | 10 ++++++++++
 raspberrypi/optimize_motd_uname.sh |  3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 raspberrypi/default-motd.sha256
 create mode 100755 raspberrypi/optimize_motd.sh
 create mode 100755 raspberrypi/optimize_motd_uname.sh

diff --git a/raspberrypi/default-motd.sha256 b/raspberrypi/default-motd.sha256
new file mode 100644
index 0000000..ec94b28
--- /dev/null
+++ b/raspberrypi/default-motd.sha256
@@ -0,0 +1 @@
+a378977155fb42bb006496321cbe31f74cbda803c3f6ca590f30e76d1afad921  -
diff --git a/raspberrypi/optimize_motd.sh b/raspberrypi/optimize_motd.sh
new file mode 100755
index 0000000..dc2de8b
--- /dev/null
+++ b/raspberrypi/optimize_motd.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#!/bin/sh
+
+default_motd_sha256="a378977155fb42bb006496321cbe31f74cbda803c3f6ca590f30e76d1afad921"
+local_sha256=$(sha256sum /etc/motd | awk '{print $1}')
+
+if [ "$remote_sha256" = "$local_sha256" ]; then
+  mv /etc/motd /etc/motd.default.backup
+fi
diff --git a/raspberrypi/optimize_motd_uname.sh b/raspberrypi/optimize_motd_uname.sh
new file mode 100755
index 0000000..781fe01
--- /dev/null
+++ b/raspberrypi/optimize_motd_uname.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+chmod -x /etc/update-motd.d/10-uname

From a3c345e6ca8bcb1a4ee0dab6e94eeacd6ac6ba87 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 01:58:26 -0500
Subject: [PATCH 12/47] optimize

---
 raspberrypi/optimize.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 97540d9..958bb58 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -2,4 +2,5 @@
 
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_boot.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_shutdown.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd_uname.sh" | bash

From fbec45490a5b7b2f8055f2d742050189d0bc55b3 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:00:49 -0500
Subject: [PATCH 13/47] fix bug

---
 raspberrypi/optimize_motd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raspberrypi/optimize_motd.sh b/raspberrypi/optimize_motd.sh
index dc2de8b..ea440ae 100755
--- a/raspberrypi/optimize_motd.sh
+++ b/raspberrypi/optimize_motd.sh
@@ -5,6 +5,6 @@
 default_motd_sha256="a378977155fb42bb006496321cbe31f74cbda803c3f6ca590f30e76d1afad921"
 local_sha256=$(sha256sum /etc/motd | awk '{print $1}')
 
-if [ "$remote_sha256" = "$local_sha256" ]; then
+if [ "$default_motd_sha256" = "$local_sha256" ]; then
   mv /etc/motd /etc/motd.default.backup
 fi

From 8507e9d61c1224c5ce11f3a31fe6e63689fd8d31 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:03:29 -0500
Subject: [PATCH 14/47] cleanup

---
 raspberrypi/optimize.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 958bb58..ba9e291 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -3,4 +3,3 @@
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_boot.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd_uname.sh" | bash

From 91f2175ea376095a623d6044992775c68b46c8b9 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:26:58 -0500
Subject: [PATCH 15/47] improve

---
 raspberrypi/default-motd.sha256    | 1 -
 raspberrypi/optimize_motd.sh       | 8 +++-----
 raspberrypi/optimize_motd_full.sh  | 8 ++++++++
 raspberrypi/optimize_motd_uname.sh | 3 ---
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 raspberrypi/default-motd.sha256
 create mode 100755 raspberrypi/optimize_motd_full.sh
 delete mode 100755 raspberrypi/optimize_motd_uname.sh

diff --git a/raspberrypi/default-motd.sha256 b/raspberrypi/default-motd.sha256
deleted file mode 100644
index ec94b28..0000000
--- a/raspberrypi/default-motd.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a378977155fb42bb006496321cbe31f74cbda803c3f6ca590f30e76d1afad921  -
diff --git a/raspberrypi/optimize_motd.sh b/raspberrypi/optimize_motd.sh
index ea440ae..48e4f63 100755
--- a/raspberrypi/optimize_motd.sh
+++ b/raspberrypi/optimize_motd.sh
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-#!/bin/sh
-
+local_motd_sha256=$(sha256sum /etc/motd | awk '{print $1}')
 default_motd_sha256="a378977155fb42bb006496321cbe31f74cbda803c3f6ca590f30e76d1afad921"
-local_sha256=$(sha256sum /etc/motd | awk '{print $1}')
 
-if [ "$default_motd_sha256" = "$local_sha256" ]; then
-  mv /etc/motd /etc/motd.default.backup
+if [ "$local_motd_sha256" = "$default_motd_sha256" ]; then
+  mv /etc/motd /etc/motd.backup.$(date +%s)
 fi
diff --git a/raspberrypi/optimize_motd_full.sh b/raspberrypi/optimize_motd_full.sh
new file mode 100755
index 0000000..add8090
--- /dev/null
+++ b/raspberrypi/optimize_motd_full.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+sudo_user=${SUDO_USER:-$(whoami)}
+sudo_user_home=$(eval echo ~$sudo_user)
+echo "$sudo_user_home/.hushlogin"
+
+mv -f /etc/motd /etc/motd.backup.$(date +%s)
+mv -f /etc/issue /etc/issue.backup.$(date +%s)
diff --git a/raspberrypi/optimize_motd_uname.sh b/raspberrypi/optimize_motd_uname.sh
deleted file mode 100755
index 781fe01..0000000
--- a/raspberrypi/optimize_motd_uname.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-chmod -x /etc/update-motd.d/10-uname

From 74a1eddc5924742e39f97c153049162b0af83dee Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:29:01 -0500
Subject: [PATCH 16/47] add shutdown

---
 raspberrypi/optimize.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index ba9e291..0bbe634 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_boot.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_shutdown.sh" | bash

From 99ccdfc445681cbe709a622a030cc01d4283aef0 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:36:49 -0500
Subject: [PATCH 17/47] fixup

---
 raspberrypi/optimize_motd_full.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/optimize_motd_full.sh b/raspberrypi/optimize_motd_full.sh
index add8090..54dd3b6 100755
--- a/raspberrypi/optimize_motd_full.sh
+++ b/raspberrypi/optimize_motd_full.sh
@@ -2,7 +2,20 @@
 
 sudo_user=${SUDO_USER:-$(whoami)}
 sudo_user_home=$(eval echo ~$sudo_user)
-echo "$sudo_user_home/.hushlogin"
+touch "$sudo_user_home/.hushlogin"
 
-mv -f /etc/motd /etc/motd.backup.$(date +%s)
-mv -f /etc/issue /etc/issue.backup.$(date +%s)
+# Check for 10-uname
+if [ -e "/etc/update-motd.d/10-uname" ]; then
+  chmod -x /etc/update-motd.d/10-uname*
+  mv -f /etc/update-motd.d/10-uname /etc/update-motd.d/10-uname.backup.$(date +%s)
+fi
+
+# Check for motd
+if [ -e "/etc/motd" ]; then
+  mv -f /etc/motd /etc/motd.backup.$(date +%s)
+fi
+
+# Check for issue
+if [ -e "/etc/issue" ]; then
+  mv -f /etc/issue /etc/issue.backup.$(date +%s)
+fi

From e92738a6dfca22bce625d002e2bfcb683daff8f6 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:52:20 -0500
Subject: [PATCH 18/47] cleanup

---
 raspberrypi/optimize_motd.sh      | 21 +++++++++++++++++----
 raspberrypi/optimize_motd_full.sh | 21 ---------------------
 2 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100755 raspberrypi/optimize_motd_full.sh

diff --git a/raspberrypi/optimize_motd.sh b/raspberrypi/optimize_motd.sh
index 48e4f63..54dd3b6 100755
--- a/raspberrypi/optimize_motd.sh
+++ b/raspberrypi/optimize_motd.sh
@@ -1,8 +1,21 @@
 #!/bin/sh
 
-local_motd_sha256=$(sha256sum /etc/motd | awk '{print $1}')
-default_motd_sha256="a378977155fb42bb006496321cbe31f74cbda803c3f6ca590f30e76d1afad921"
+sudo_user=${SUDO_USER:-$(whoami)}
+sudo_user_home=$(eval echo ~$sudo_user)
+touch "$sudo_user_home/.hushlogin"
 
-if [ "$local_motd_sha256" = "$default_motd_sha256" ]; then
-  mv /etc/motd /etc/motd.backup.$(date +%s)
+# Check for 10-uname
+if [ -e "/etc/update-motd.d/10-uname" ]; then
+  chmod -x /etc/update-motd.d/10-uname*
+  mv -f /etc/update-motd.d/10-uname /etc/update-motd.d/10-uname.backup.$(date +%s)
+fi
+
+# Check for motd
+if [ -e "/etc/motd" ]; then
+  mv -f /etc/motd /etc/motd.backup.$(date +%s)
+fi
+
+# Check for issue
+if [ -e "/etc/issue" ]; then
+  mv -f /etc/issue /etc/issue.backup.$(date +%s)
 fi
diff --git a/raspberrypi/optimize_motd_full.sh b/raspberrypi/optimize_motd_full.sh
deleted file mode 100755
index 54dd3b6..0000000
--- a/raspberrypi/optimize_motd_full.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-sudo_user=${SUDO_USER:-$(whoami)}
-sudo_user_home=$(eval echo ~$sudo_user)
-touch "$sudo_user_home/.hushlogin"
-
-# Check for 10-uname
-if [ -e "/etc/update-motd.d/10-uname" ]; then
-  chmod -x /etc/update-motd.d/10-uname*
-  mv -f /etc/update-motd.d/10-uname /etc/update-motd.d/10-uname.backup.$(date +%s)
-fi
-
-# Check for motd
-if [ -e "/etc/motd" ]; then
-  mv -f /etc/motd /etc/motd.backup.$(date +%s)
-fi
-
-# Check for issue
-if [ -e "/etc/issue" ]; then
-  mv -f /etc/issue /etc/issue.backup.$(date +%s)
-fi

From eb116b3622ed6485980b318bce5b3d1ad9b3f61e Mon Sep 17 00:00:00 2001
From: Drewry Pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 02:56:43 -0500
Subject: [PATCH 19/47] Update optimize_power.sh

---
 raspberrypi/optimize_power.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/raspberrypi/optimize_power.sh b/raspberrypi/optimize_power.sh
index 1d59715..10f48d8 100755
--- a/raspberrypi/optimize_power.sh
+++ b/raspberrypi/optimize_power.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
 
 sudo sed -i ' 1 s/.*/& vt.global_cursor_default=0/' /boot/cmdline.txt || { echo "Error: Failed to modify cmdline.txt."; exit 1; }
-
-

From 09689ca9d75f05f02cb5b8a7f3383a2086c412f4 Mon Sep 17 00:00:00 2001
From: Drewry Pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 03:10:50 -0500
Subject: [PATCH 20/47] beeper/beepy/main

---
 raspberrypi/optimize.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 0bbe634..1d24d28 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_boot.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_shutdown.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_boot.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_power.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_shutdown.sh" | bash

From e922974dcea59de96960f005d084314001980e7e Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 17:18:16 -0500
Subject: [PATCH 21/47] modify_cmdline

---
 raspberrypi/optimize_power.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/raspberrypi/optimize_power.sh b/raspberrypi/optimize_power.sh
index 1d59715..2113e67 100755
--- a/raspberrypi/optimize_power.sh
+++ b/raspberrypi/optimize_power.sh
@@ -1,5 +1,23 @@
 #!/bin/sh
 
-sudo sed -i ' 1 s/.*/& vt.global_cursor_default=0/' /boot/cmdline.txt || { echo "Error: Failed to modify cmdline.txt."; exit 1; }
+modify_cmdline() {
+  if echo "${1}" | grep -q '='; then
+    modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)
+    modify_cmdline_value=$(echo "${1}" | cut -d'=' -f2-)
+  else
+    modify_cmdline_key="${1}"
+    modify_cmdline_value="${2}"
+  fi
 
+  modify_cmdline_cmdline="$(cat /boot/cmdline.txt)"
 
+  if echo "${modify_cmdline_cmdline}" | grep -q -E "\b${modify_cmdline_key}=[^ ]*"; then
+    modify_cmdline_cmdline=$(echo "${modify_cmdline_cmdline}" | sed "s/\b${modify_cmdline_key}=[^ ]*/${modify_cmdline_key}=${modify_cmdline_value}/g")
+  else
+    modify_cmdline_cmdline="${modify_cmdline_cmdline} ${modify_cmdline_key}=${modify_cmdline_value}"
+  fi
+
+  echo "${modify_cmdline_cmdline}" > /boot/cmdline.txt
+}
+
+modify_cmdline "vt.global_cursor_default=0"

From 0f3fe4dceaa3385fae1477be65c7dba3f4916756 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 17:25:42 -0500
Subject: [PATCH 22/47] set cpu count

---
 raspberrypi/optimize.sh           |  8 ++++----
 raspberrypi/set-cpu-count-to-2.sh | 23 +++++++++++++++++++++++
 raspberrypi/set-cpu-count-to-4.sh | 23 +++++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100755 raspberrypi/set-cpu-count-to-2.sh
 create mode 100755 raspberrypi/set-cpu-count-to-4.sh

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 0bbe634..22bfa89 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_boot.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_motd.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_power.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize/raspberrypi/optimize_shutdown.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_boot.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_power.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_shutdown.sh" | bash
diff --git a/raspberrypi/set-cpu-count-to-2.sh b/raspberrypi/set-cpu-count-to-2.sh
new file mode 100755
index 0000000..9a9e30c
--- /dev/null
+++ b/raspberrypi/set-cpu-count-to-2.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+modify_cmdline() {
+  if echo "${1}" | grep -q '='; then
+    modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)
+    modify_cmdline_value=$(echo "${1}" | cut -d'=' -f2-)
+  else
+    modify_cmdline_key="${1}"
+    modify_cmdline_value="${2}"
+  fi
+
+  modify_cmdline_cmdline="$(cat /boot/cmdline.txt)"
+
+  if echo "${modify_cmdline_cmdline}" | grep -q -E "\b${modify_cmdline_key}=[^ ]*"; then
+    modify_cmdline_cmdline=$(echo "${modify_cmdline_cmdline}" | sed "s/\b${modify_cmdline_key}=[^ ]*/${modify_cmdline_key}=${modify_cmdline_value}/g")
+  else
+    modify_cmdline_cmdline="${modify_cmdline_cmdline} ${modify_cmdline_key}=${modify_cmdline_value}"
+  fi
+
+  echo "${modify_cmdline_cmdline}" > /boot/cmdline.txt
+}
+
+modify_cmdline "maxcpus=2"
diff --git a/raspberrypi/set-cpu-count-to-4.sh b/raspberrypi/set-cpu-count-to-4.sh
new file mode 100755
index 0000000..a0837f2
--- /dev/null
+++ b/raspberrypi/set-cpu-count-to-4.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+modify_cmdline() {
+  if echo "${1}" | grep -q '='; then
+    modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)
+    modify_cmdline_value=$(echo "${1}" | cut -d'=' -f2-)
+  else
+    modify_cmdline_key="${1}"
+    modify_cmdline_value="${2}"
+  fi
+
+  modify_cmdline_cmdline="$(cat /boot/cmdline.txt)"
+
+  if echo "${modify_cmdline_cmdline}" | grep -q -E "\b${modify_cmdline_key}=[^ ]*"; then
+    modify_cmdline_cmdline=$(echo "${modify_cmdline_cmdline}" | sed "s/\b${modify_cmdline_key}=[^ ]*/${modify_cmdline_key}=${modify_cmdline_value}/g")
+  else
+    modify_cmdline_cmdline="${modify_cmdline_cmdline} ${modify_cmdline_key}=${modify_cmdline_value}"
+  fi
+
+  echo "${modify_cmdline_cmdline}" > /boot/cmdline.txt
+}
+
+modify_cmdline "maxcpus=4"

From 658454e87bca6b8a83bf135f98aaabe1c42a32fc Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 18:57:00 -0500
Subject: [PATCH 23/47] improve

---
 raspberrypi/optimize_boot.sh      |  3 ++-
 raspberrypi/optimize_motd.sh      | 20 +++++++++++--------
 raspberrypi/optimize_power.sh     |  1 +
 raspberrypi/optimize_shutdown.sh  | 33 ++++++++++++++++++++++++++++++-
 raspberrypi/set-cpu-count-to-2.sh |  1 +
 raspberrypi/set-cpu-count-to-4.sh |  1 +
 6 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/raspberrypi/optimize_boot.sh b/raspberrypi/optimize_boot.sh
index 2018022..880116b 100755
--- a/raspberrypi/optimize_boot.sh
+++ b/raspberrypi/optimize_boot.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 #This script reduces boot times from 60s to 19s on the RPi0w
 
+#shellcheck disable=SC2312
 if [ "$(id -u)" -ne 0 ]; then
-    echo "This script must be run as root" 
+    echo "This script must be run as root"
     exit 1
 fi
 
diff --git a/raspberrypi/optimize_motd.sh b/raspberrypi/optimize_motd.sh
index 54dd3b6..76dff17 100755
--- a/raspberrypi/optimize_motd.sh
+++ b/raspberrypi/optimize_motd.sh
@@ -1,21 +1,25 @@
 #!/bin/sh
 
 sudo_user=${SUDO_USER:-$(whoami)}
-sudo_user_home=$(eval echo ~$sudo_user)
-touch "$sudo_user_home/.hushlogin"
+sudo_user_home=$(eval echo "~${sudo_user}")
+
+touch "${sudo_user_home}/.hushlogin"
+
+DATE="$(date +%s)"
+
+if [ -z "${DATE}" ]; then
+  DATE=default
+fi
 
-# Check for 10-uname
 if [ -e "/etc/update-motd.d/10-uname" ]; then
   chmod -x /etc/update-motd.d/10-uname*
-  mv -f /etc/update-motd.d/10-uname /etc/update-motd.d/10-uname.backup.$(date +%s)
+  mv -f "/etc/update-motd.d/10-uname" "/etc/update-motd.d/10-uname.backup.${DATE}"
 fi
 
-# Check for motd
 if [ -e "/etc/motd" ]; then
-  mv -f /etc/motd /etc/motd.backup.$(date +%s)
+  mv -f "/etc/motd" "/etc/motd.backup.${DATE}"
 fi
 
-# Check for issue
 if [ -e "/etc/issue" ]; then
-  mv -f /etc/issue /etc/issue.backup.$(date +%s)
+  mv -f "/etc/issue" "/etc/issue.backup.${DATE}"
 fi
diff --git a/raspberrypi/optimize_power.sh b/raspberrypi/optimize_power.sh
index 2113e67..088fe5d 100755
--- a/raspberrypi/optimize_power.sh
+++ b/raspberrypi/optimize_power.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# note: this currently only works for key=value cmdline args
 modify_cmdline() {
   if echo "${1}" | grep -q '='; then
     modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)
diff --git a/raspberrypi/optimize_shutdown.sh b/raspberrypi/optimize_shutdown.sh
index efba3fd..eb07d67 100755
--- a/raspberrypi/optimize_shutdown.sh
+++ b/raspberrypi/optimize_shutdown.sh
@@ -1,3 +1,34 @@
 #!/bin/sh
 
-echo "kernel.printk = -1 -1 -1 -1" > "/etc/sysctl.d/20-quiet-printk.conf" || { echo "Error: Create '/etc/sysctl.d/20-quiet-printk.conf'."; exit 1; }
+modify_conf() {
+  modify_conf_conf_file="$1"
+
+  if echo "${2}" | grep -q '='; then
+    modify_conf_key=$(echo "${2}" | cut -d'=' -f1)
+    modify_conf_value=$(echo "${2}" | cut -d'=' -f2-)
+  else
+    modify_conf_key="${2}"
+    modify_conf_value="${3}"
+  fi
+
+  modify_conf_new_content=""
+  modify_conf_found=0
+
+  if [ -f "${modify_conf_conf_file}" ]; then
+    while IFS= read -r modify_conf_line; do
+      if echo "${modify_conf_line}" | grep -q "^${modify_conf_key}"; then
+        modify_conf_line="${modify_conf_key}=${modify_conf_value}"
+        modify_conf_found=1
+      fi
+      modify_conf_new_content="${modify_conf_new_content}$(printf "%s\n" "${modify_conf_line}")"
+    done < "${modify_conf_conf_file}"
+  fi
+
+  [ "${modify_conf_found}" -eq 0 ] && modify_conf_new_content="${modify_conf_new_content}$(printf '%s=%s\n' "${modify_conf_key}" "${modify_conf_value}")"
+
+  modify_conf_new_content=$(printf "%s" "${modify_conf_new_content}" | sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba')
+
+  printf "%s" "${modify_conf_new_content}" > "${modify_conf_conf_file}"
+}
+
+modify_conf "/etc/sysctl.d/20-quiet-printk.conf" "kernel.printk" "-1 -1 -1 -1"
diff --git a/raspberrypi/set-cpu-count-to-2.sh b/raspberrypi/set-cpu-count-to-2.sh
index 9a9e30c..ab8402f 100755
--- a/raspberrypi/set-cpu-count-to-2.sh
+++ b/raspberrypi/set-cpu-count-to-2.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# note: this currently only works for key=value cmdline args
 modify_cmdline() {
   if echo "${1}" | grep -q '='; then
     modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)
diff --git a/raspberrypi/set-cpu-count-to-4.sh b/raspberrypi/set-cpu-count-to-4.sh
index a0837f2..d706785 100755
--- a/raspberrypi/set-cpu-count-to-4.sh
+++ b/raspberrypi/set-cpu-count-to-4.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# note: this currently only works for key=value cmdline args
 modify_cmdline() {
   if echo "${1}" | grep -q '='; then
     modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)

From c220946175d51e1df1d5b3f667c07380fb56dd04 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 19:00:18 -0500
Subject: [PATCH 24/47] refactor

---
 .../{optimize_power.sh => disable_cursor.sh}  |  0
 raspberrypi/enable_cursor.sh                  | 24 +++++++++++++++++++
 raspberrypi/optimize.sh                       |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 rename raspberrypi/{optimize_power.sh => disable_cursor.sh} (100%)
 create mode 100755 raspberrypi/enable_cursor.sh

diff --git a/raspberrypi/optimize_power.sh b/raspberrypi/disable_cursor.sh
similarity index 100%
rename from raspberrypi/optimize_power.sh
rename to raspberrypi/disable_cursor.sh
diff --git a/raspberrypi/enable_cursor.sh b/raspberrypi/enable_cursor.sh
new file mode 100755
index 0000000..c2e9103
--- /dev/null
+++ b/raspberrypi/enable_cursor.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# note: this currently only works for key=value cmdline args
+modify_cmdline() {
+  if echo "${1}" | grep -q '='; then
+    modify_cmdline_key=$(echo "${1}" | cut -d'=' -f1)
+    modify_cmdline_value=$(echo "${1}" | cut -d'=' -f2-)
+  else
+    modify_cmdline_key="${1}"
+    modify_cmdline_value="${2}"
+  fi
+
+  modify_cmdline_cmdline="$(cat /boot/cmdline.txt)"
+
+  if echo "${modify_cmdline_cmdline}" | grep -q -E "\b${modify_cmdline_key}=[^ ]*"; then
+    modify_cmdline_cmdline=$(echo "${modify_cmdline_cmdline}" | sed "s/\b${modify_cmdline_key}=[^ ]*/${modify_cmdline_key}=${modify_cmdline_value}/g")
+  else
+    modify_cmdline_cmdline="${modify_cmdline_cmdline} ${modify_cmdline_key}=${modify_cmdline_value}"
+  fi
+
+  echo "${modify_cmdline_cmdline}" > /boot/cmdline.txt
+}
+
+modify_cmdline "vt.global_cursor_default=1"
diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 22bfa89..8329f0f 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -2,5 +2,5 @@
 
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_boot.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_motd.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_power.sh" | bash
+curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/disable_cursor.sh" | bash
 curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_shutdown.sh" | bash

From ed5b25ace62d8a8c6ee8c8df245518eaf7fcd75f Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 19:15:10 -0500
Subject: [PATCH 25/47] newline

---
 raspberrypi/optimize_shutdown.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raspberrypi/optimize_shutdown.sh b/raspberrypi/optimize_shutdown.sh
index eb07d67..e21df08 100755
--- a/raspberrypi/optimize_shutdown.sh
+++ b/raspberrypi/optimize_shutdown.sh
@@ -28,7 +28,7 @@ modify_conf() {
 
   modify_conf_new_content=$(printf "%s" "${modify_conf_new_content}" | sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba')
 
-  printf "%s" "${modify_conf_new_content}" > "${modify_conf_conf_file}"
+  printf "%s\n" "${modify_conf_new_content}" > "${modify_conf_conf_file}"
 }
 
 modify_conf "/etc/sysctl.d/20-quiet-printk.conf" "kernel.printk" "-1 -1 -1 -1"

From 44468643a5f5a1d96da639d01fa8320555edcd20 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 19:20:15 -0500
Subject: [PATCH 26/47] align

---
 raspberrypi/optimize.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 8329f0f..f230264 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_boot.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_motd.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/disable_cursor.sh" | bash
-curl -s "https://raw.githubusercontent.com/dezren39-dev/beepy/optimize2/raspberrypi/optimize_shutdown.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_boot.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_cursor.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_shutdown.sh" | bash

From d2b2f9c9e7b5207b10ac99651baf71a02bca6076 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 19:22:33 -0500
Subject: [PATCH 27/47] optimize

---
 raspberrypi/{optimize_motd.sh => disable_motd.sh} | 0
 raspberrypi/optimize.sh                           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename raspberrypi/{optimize_motd.sh => disable_motd.sh} (100%)

diff --git a/raspberrypi/optimize_motd.sh b/raspberrypi/disable_motd.sh
similarity index 100%
rename from raspberrypi/optimize_motd.sh
rename to raspberrypi/disable_motd.sh
diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index f230264..e32ba14 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_boot.sh" | bash
-curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_motd.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_cursor.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_shutdown.sh" | bash

From 6c975975ffc5db0d04c653c20676cccf25b3bd57 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:17:22 -0500
Subject: [PATCH 28/47] login prompt

---
 raspberrypi/disable_login_prompt.sh | 44 +++++++++++++++++++++++++++++
 raspberrypi/enable_login_prompt.sh  | 44 +++++++++++++++++++++++++++++
 raspberrypi/optimize.sh             |  1 +
 3 files changed, 89 insertions(+)
 create mode 100755 raspberrypi/disable_login_prompt.sh
 create mode 100755 raspberrypi/enable_login_prompt.sh

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
new file mode 100755
index 0000000..761b241
--- /dev/null
+++ b/raspberrypi/disable_login_prompt.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+modify_service_conf() {
+  modify_service_conf_file="$1"
+  modify_service_conf_linePrefix="$2"
+  modify_service_conf_subcommand="$3"
+  modify_service_conf_flag="$4"
+
+  if [ ! -f "${modify_service_conf_file}" ]; then
+    exit 1
+  fi
+
+  modify_service_conf_new_content=""
+  modify_service_conf_found=0
+
+  while IFS= read -r modify_service_conf_line; do
+    if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
+      modify_service_conf_found=1
+      case "${modify_service_conf_subcommand}" in
+        add)
+          if ! echo "${modify_service_conf_line}" | grep -q "${modify_service_conf_flag}"; then
+            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
+          fi
+          ;;
+        del)
+          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\b${modify_service_conf_flag}\b//g")
+          ;;
+        *)
+          ;;
+      esac
+    fi
+    modify_service_conf_new_content="${modify_service_conf_new_content}$(printf "%s\n" "${modify_service_conf_line}")"
+  done < "${modify_service_conf_file}"
+
+  if [ "${modify_service_conf_found}" -eq 0 ]; then
+    exit 1
+  fi
+
+  modify_service_conf_new_content=$(printf "%s" "${modify_service_conf_new_content}" | sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba')
+  printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
+}
+
+modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--skip-login"
+modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--nonewline"
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
new file mode 100755
index 0000000..761b241
--- /dev/null
+++ b/raspberrypi/enable_login_prompt.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+modify_service_conf() {
+  modify_service_conf_file="$1"
+  modify_service_conf_linePrefix="$2"
+  modify_service_conf_subcommand="$3"
+  modify_service_conf_flag="$4"
+
+  if [ ! -f "${modify_service_conf_file}" ]; then
+    exit 1
+  fi
+
+  modify_service_conf_new_content=""
+  modify_service_conf_found=0
+
+  while IFS= read -r modify_service_conf_line; do
+    if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
+      modify_service_conf_found=1
+      case "${modify_service_conf_subcommand}" in
+        add)
+          if ! echo "${modify_service_conf_line}" | grep -q "${modify_service_conf_flag}"; then
+            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
+          fi
+          ;;
+        del)
+          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\b${modify_service_conf_flag}\b//g")
+          ;;
+        *)
+          ;;
+      esac
+    fi
+    modify_service_conf_new_content="${modify_service_conf_new_content}$(printf "%s\n" "${modify_service_conf_line}")"
+  done < "${modify_service_conf_file}"
+
+  if [ "${modify_service_conf_found}" -eq 0 ]; then
+    exit 1
+  fi
+
+  modify_service_conf_new_content=$(printf "%s" "${modify_service_conf_new_content}" | sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba')
+  printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
+}
+
+modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--skip-login"
+modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--nonewline"
diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index e32ba14..3f20c15 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -2,5 +2,6 @@
 
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_boot.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_motd.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_login_prompt.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_cursor.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_shutdown.sh" | bash

From 6bb405dedea88d329719a1c591c095f0c71be490 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:25:37 -0500
Subject: [PATCH 29/47] improve

---
 raspberrypi/disable_login_prompt.sh |  9 ++++++---
 raspberrypi/enable_login_prompt.sh  | 13 ++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 761b241..97b4ec4 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -6,6 +6,9 @@ modify_service_conf() {
   modify_service_conf_subcommand="$3"
   modify_service_conf_flag="$4"
 
+  # Escape characters that have special meaning in regular expressions
+  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[]\/$*.^|[]/\\&/g')
+
   if [ ! -f "${modify_service_conf_file}" ]; then
     exit 1
   fi
@@ -18,12 +21,12 @@ modify_service_conf() {
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q "${modify_service_conf_flag}"; then
+          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
             modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
           fi
           ;;
-        del)
-          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\b${modify_service_conf_flag}\b//g")
+        del|delete)
+          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
           ;;
         *)
           ;;
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index 761b241..a6f7cc1 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -6,6 +6,9 @@ modify_service_conf() {
   modify_service_conf_subcommand="$3"
   modify_service_conf_flag="$4"
 
+  # Escape characters that have special meaning in regular expressions
+  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[]\/$*.^|[]/\\&/g')
+
   if [ ! -f "${modify_service_conf_file}" ]; then
     exit 1
   fi
@@ -18,12 +21,12 @@ modify_service_conf() {
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q "${modify_service_conf_flag}"; then
+          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
             modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
           fi
           ;;
-        del)
-          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\b${modify_service_conf_flag}\b//g")
+        del|delete)
+          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
           ;;
         *)
           ;;
@@ -40,5 +43,5 @@ modify_service_conf() {
   printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
 }
 
-modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--skip-login"
-modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--nonewline"
+modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "del" "--skip-login"
+modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "del" "--nonewline"

From 7681010ccb177870b7cfa5e0d9bd75d360b47c56 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:33:35 -0500
Subject: [PATCH 30/47] escape

---
 raspberrypi/disable_login_prompt.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 97b4ec4..23af742 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -16,7 +16,7 @@ modify_service_conf() {
   modify_service_conf_new_content=""
   modify_service_conf_found=0
 
-  while IFS= read -r modify_service_conf_line; do
+  while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
     if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
@@ -32,14 +32,13 @@ modify_service_conf() {
           ;;
       esac
     fi
-    modify_service_conf_new_content="${modify_service_conf_new_content}$(printf "%s\n" "${modify_service_conf_line}")"
+    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
     exit 1
   fi
 
-  modify_service_conf_new_content=$(printf "%s" "${modify_service_conf_new_content}" | sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba')
   printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
 }
 

From 8b98756ef271ca987161ffc0c0864c67215478b9 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:38:08 -0500
Subject: [PATCH 31/47] escape

---
 raspberrypi/disable_login_prompt.sh |  8 ++++----
 raspberrypi/enable_login_prompt.sh  | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 23af742..13b5065 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -16,13 +16,13 @@ modify_service_conf() {
   modify_service_conf_new_content=""
   modify_service_conf_found=0
 
-  while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
+  while IFS= read -r modify_service_conf_line || [ -n "${modify_service_conf_line}" ]; do
     if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
-            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
+          if ! echo "${modify_service_conf_line}" | grep -qw "${modify_service_conf_flag}"; then
+            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${modify_service_conf_line#${#modify_service_conf_linePrefix}}"
           fi
           ;;
         del|delete)
@@ -39,7 +39,7 @@ modify_service_conf() {
     exit 1
   fi
 
-  printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
+  printf "%s" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
 }
 
 modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--skip-login"
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index a6f7cc1..e494d0f 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -16,13 +16,13 @@ modify_service_conf() {
   modify_service_conf_new_content=""
   modify_service_conf_found=0
 
-  while IFS= read -r modify_service_conf_line; do
+  while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
     if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
-            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
+          if ! echo "${modify_service_conf_line}" | grep -qw "${modify_service_conf_flag}"; then
+            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${modify_service_conf_line#${#modify_service_conf_linePrefix}}"
           fi
           ;;
         del|delete)
@@ -32,15 +32,14 @@ modify_service_conf() {
           ;;
       esac
     fi
-    modify_service_conf_new_content="${modify_service_conf_new_content}$(printf "%s\n" "${modify_service_conf_line}")"
+    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
     exit 1
   fi
 
-  modify_service_conf_new_content=$(printf "%s" "${modify_service_conf_new_content}" | sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba')
-  printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
+  printf "%s" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
 }
 
 modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "del" "--skip-login"

From bf51c81328a81d070f3998621d7dd8eeec87a90c Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:42:23 -0500
Subject: [PATCH 32/47] escape again

---
 raspberrypi/disable_login_prompt.sh | 9 ++++-----
 raspberrypi/enable_login_prompt.sh  | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 13b5065..2b3e84e 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -16,20 +16,19 @@ modify_service_conf() {
   modify_service_conf_new_content=""
   modify_service_conf_found=0
 
-  while IFS= read -r modify_service_conf_line || [ -n "${modify_service_conf_line}" ]; do
+  while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
     if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -qw "${modify_service_conf_flag}"; then
-            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${modify_service_conf_line#${#modify_service_conf_linePrefix}}"
+          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
+            remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
+            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
           modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
           ;;
-        *)
-          ;;
       esac
     fi
     modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index e494d0f..efd051d 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -21,15 +21,14 @@ modify_service_conf() {
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -qw "${modify_service_conf_flag}"; then
-            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${modify_service_conf_line#${#modify_service_conf_linePrefix}}"
+          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
+            remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
+            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
           modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
           ;;
-        *)
-          ;;
       esac
     fi
     modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")

From 0b98110ca6387bb93ea3f05233067fbc21733b41 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:44:25 -0500
Subject: [PATCH 33/47] escape

---
 raspberrypi/disable_login_prompt.sh | 4 ++--
 raspberrypi/enable_login_prompt.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 2b3e84e..cc3ffb1 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -17,11 +17,11 @@ modify_service_conf() {
   modify_service_conf_found=0
 
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
-    if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
+    if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
+          if ! echo "${modify_service_conf_line}" | grep -q -e "\\b${modify_service_conf_flag_escaped}\\b"; then
             remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
             modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index efd051d..823cdd1 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -17,11 +17,11 @@ modify_service_conf() {
   modify_service_conf_found=0
 
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
-    if echo "${modify_service_conf_line}" | grep -q "^${modify_service_conf_linePrefix}"; then
+    if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q "\\b${modify_service_conf_flag_escaped}\\b"; then
+          if ! echo "${modify_service_conf_line}" | grep -q -e "\\b${modify_service_conf_flag_escaped}\\b"; then
             remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
             modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi

From c7154dbaefede2522a073a9c091338776d30e0f0 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:45:58 -0500
Subject: [PATCH 34/47] escape2

---
 raspberrypi/disable_login_prompt.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index cc3ffb1..fe0b5b5 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -19,15 +19,16 @@ modify_service_conf() {
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
     if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix}"; then
       modify_service_conf_found=1
+      remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q -e "\\b${modify_service_conf_flag_escaped}\\b"; then
-            remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
+          if ! echo "${remaining_line}" | grep -q -e "\\b${modify_service_conf_flag_escaped}\\b"; then
             modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
-          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
+          remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
+          modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac
     fi

From 4206f4b13561c146a21cedbbb5244253ce571df5 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:47:35 -0500
Subject: [PATCH 35/47] escape3

---
 raspberrypi/disable_login_prompt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index fe0b5b5..f32c23d 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -27,12 +27,12 @@ modify_service_conf() {
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
+          remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g" | awk '{$1=$1};1')
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
+    modify_service_conf_new_content=$(printf "%s\n" "${modify_service_conf_new_content}${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then

From 252261d70fa4713d1e6aa6f1bd7d3f093a109549 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:51:44 -0500
Subject: [PATCH 36/47] escape4

---
 raspberrypi/disable_login_prompt.sh | 15 ++++++++-------
 raspberrypi/enable_login_prompt.sh  | 16 +++++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index f32c23d..6159da2 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -6,8 +6,8 @@ modify_service_conf() {
   modify_service_conf_subcommand="$3"
   modify_service_conf_flag="$4"
 
-  # Escape characters that have special meaning in regular expressions
-  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[]\/$*.^|[]/\\&/g')
+  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[\\/&]/\\&/g')
+  modify_service_conf_linePrefix_escaped=$(echo "${modify_service_conf_linePrefix}" | sed -e 's/[\\/&]/\\&/g')
 
   if [ ! -f "${modify_service_conf_file}" ]; then
     exit 1
@@ -17,22 +17,23 @@ modify_service_conf() {
   modify_service_conf_found=0
 
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
-    if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix}"; then
+    if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix_escaped}"; then
       modify_service_conf_found=1
-      remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
+      remaining_line=${modify_service_conf_line#${modify_service_conf_linePrefix}}
+      remaining_line=$(echo "${remaining_line}" | awk '{$1=$1};1')
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${remaining_line}" | grep -q -e "\\b${modify_service_conf_flag_escaped}\\b"; then
+          if ! echo "${remaining_line}" | grep -q -w -e "${modify_service_conf_flag_escaped}"; then
             modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
           remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g" | awk '{$1=$1};1')
-          modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
+          modify_service_conf_line="${modify_service_conf_linePrefix}${remaining_line}"
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n" "${modify_service_conf_new_content}${modify_service_conf_line}")
+    modify_service_conf_new_content="${modify_service_conf_new_content}${modify_service_conf_line}"$'\n'
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index 823cdd1..512c097 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -6,8 +6,8 @@ modify_service_conf() {
   modify_service_conf_subcommand="$3"
   modify_service_conf_flag="$4"
 
-  # Escape characters that have special meaning in regular expressions
-  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[]\/$*.^|[]/\\&/g')
+  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[\\/&]/\\&/g')
+  modify_service_conf_linePrefix_escaped=$(echo "${modify_service_conf_linePrefix}" | sed -e 's/[\\/&]/\\&/g')
 
   if [ ! -f "${modify_service_conf_file}" ]; then
     exit 1
@@ -17,21 +17,23 @@ modify_service_conf() {
   modify_service_conf_found=0
 
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
-    if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix}"; then
+    if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix_escaped}"; then
       modify_service_conf_found=1
+      remaining_line=${modify_service_conf_line#${modify_service_conf_linePrefix}}
+      remaining_line=$(echo "${remaining_line}" | awk '{$1=$1};1')
       case "${modify_service_conf_subcommand}" in
         add)
-          if ! echo "${modify_service_conf_line}" | grep -q -e "\\b${modify_service_conf_flag_escaped}\\b"; then
-            remaining_line=$(echo "${modify_service_conf_line#${#modify_service_conf_linePrefix}}" | awk '{$1=$1};1')
+          if ! echo "${remaining_line}" | grep -q -w -e "${modify_service_conf_flag_escaped}"; then
             modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
-          modify_service_conf_line=$(echo "${modify_service_conf_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g")
+          remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g" | awk '{$1=$1};1')
+          modify_service_conf_line="${modify_service_conf_linePrefix}${remaining_line}"
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
+    modify_service_conf_new_content="${modify_service_conf_new_content}${modify_service_conf_line}"$'\n'
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then

From 6e2f31d47c427d4a57498880e88511ebd3117a86 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:55:11 -0500
Subject: [PATCH 37/47] escape5

---
 raspberrypi/disable_login_prompt.sh | 6 ++----
 raspberrypi/enable_login_prompt.sh  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 6159da2..b425f17 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 modify_service_conf() {
   modify_service_conf_file="$1"
   modify_service_conf_linePrefix="$2"
@@ -28,8 +26,8 @@ modify_service_conf() {
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g" | awk '{$1=$1};1')
-          modify_service_conf_line="${modify_service_conf_linePrefix}${remaining_line}"
+          remaining_line=$(echo "${remaining_line}" | sed -E "s/\b${modify_service_conf_flag_escaped}\b//g" | awk '{$1=$1};1')
+          modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac
     fi
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index 512c097..890df00 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 modify_service_conf() {
   modify_service_conf_file="$1"
   modify_service_conf_linePrefix="$2"
@@ -28,8 +26,8 @@ modify_service_conf() {
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed "s/\\b${modify_service_conf_flag_escaped}\\b//g" | awk '{$1=$1};1')
-          modify_service_conf_line="${modify_service_conf_linePrefix}${remaining_line}"
+          remaining_line=$(echo "${remaining_line}" | sed -E "s/\b${modify_service_conf_flag_escaped}\b//g" | awk '{$1=$1};1')
+          modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac
     fi

From 2a433a851560a5c2e4ad065e0226f12caa7f841d Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 22:57:48 -0500
Subject: [PATCH 38/47] no word boundary

---
 raspberrypi/disable_login_prompt.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index b425f17..2fa44b2 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -17,16 +17,15 @@ modify_service_conf() {
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
     if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix_escaped}"; then
       modify_service_conf_found=1
-      remaining_line=${modify_service_conf_line#${modify_service_conf_linePrefix}}
-      remaining_line=$(echo "${remaining_line}" | awk '{$1=$1};1')
+      remaining_line="${modify_service_conf_line#${modify_service_conf_linePrefix} }"
       case "${modify_service_conf_subcommand}" in
         add)
           if ! echo "${remaining_line}" | grep -q -w -e "${modify_service_conf_flag_escaped}"; then
-            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
+            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed -E "s/\b${modify_service_conf_flag_escaped}\b//g" | awk '{$1=$1};1')
+          remaining_line=$(echo "${remaining_line}" | sed "s/\s*${modify_service_conf_flag_escaped}\s*/ /g")
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac

From a09682ef00f3c745b2b7e608a07180b31fb07237 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 23:01:45 -0500
Subject: [PATCH 39/47] sedawk

---
 raspberrypi/disable_login_prompt.sh | 2 +-
 raspberrypi/enable_login_prompt.sh  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 2fa44b2..9e4b072 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -25,7 +25,7 @@ modify_service_conf() {
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed "s/\s*${modify_service_conf_flag_escaped}\s*/ /g")
+          remaining_line=$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index 890df00..e480f88 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -17,16 +17,15 @@ modify_service_conf() {
   while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
     if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix_escaped}"; then
       modify_service_conf_found=1
-      remaining_line=${modify_service_conf_line#${modify_service_conf_linePrefix}}
-      remaining_line=$(echo "${remaining_line}" | awk '{$1=$1};1')
+      remaining_line="${modify_service_conf_line#${modify_service_conf_linePrefix} }"
       case "${modify_service_conf_subcommand}" in
         add)
           if ! echo "${remaining_line}" | grep -q -w -e "${modify_service_conf_flag_escaped}"; then
-            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
+            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed -E "s/\b${modify_service_conf_flag_escaped}\b//g" | awk '{$1=$1};1')
+          remaining_line=$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
       esac

From 95987c25551cb56a90a445a91320ef1d42d9e7c5 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Sun, 27 Aug 2023 23:59:57 -0500
Subject: [PATCH 40/47] del

---
 raspberrypi/disable_login_prompt.sh | 11 ++++++++---
 raspberrypi/enable_login_prompt.sh  | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 9e4b072..c5c24a9 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 modify_service_conf() {
   modify_service_conf_file="$1"
   modify_service_conf_linePrefix="$2"
@@ -14,23 +16,26 @@ modify_service_conf() {
   modify_service_conf_new_content=""
   modify_service_conf_found=0
 
-  while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
+  while IFS= read -r modify_service_conf_line || [ -n "${modify_service_conf_line}" ]; do
     if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix_escaped}"; then
       modify_service_conf_found=1
+      #shellcheck disable=2295
       remaining_line="${modify_service_conf_line#${modify_service_conf_linePrefix} }"
       case "${modify_service_conf_subcommand}" in
         add)
           if ! echo "${remaining_line}" | grep -q -w -e "${modify_service_conf_flag_escaped}"; then
-            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
+            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
           remaining_line=$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
+        *)
+          ;;
       esac
     fi
-    modify_service_conf_new_content="${modify_service_conf_new_content}${modify_service_conf_line}"$'\n'
+    modify_service_conf_new_content=$(printf "%s\n" "${modify_service_conf_new_content}${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index e480f88..4a7a912 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 modify_service_conf() {
   modify_service_conf_file="$1"
   modify_service_conf_linePrefix="$2"
@@ -14,23 +16,26 @@ modify_service_conf() {
   modify_service_conf_new_content=""
   modify_service_conf_found=0
 
-  while IFS= read -r modify_service_conf_line || [ -n "$modify_service_conf_line" ]; do
+  while IFS= read -r modify_service_conf_line || [ -n "${modify_service_conf_line}" ]; do
     if echo "${modify_service_conf_line}" | grep -q -e "^${modify_service_conf_linePrefix_escaped}"; then
       modify_service_conf_found=1
+      #shellcheck disable=2295
       remaining_line="${modify_service_conf_line#${modify_service_conf_linePrefix} }"
       case "${modify_service_conf_subcommand}" in
         add)
           if ! echo "${remaining_line}" | grep -q -w -e "${modify_service_conf_flag_escaped}"; then
-            modify_service_conf_line="${modify_service_conf_line} ${modify_service_conf_flag}"
+            modify_service_conf_line="${modify_service_conf_linePrefix} ${modify_service_conf_flag} ${remaining_line}"
           fi
           ;;
         del|delete)
           remaining_line=$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
+        *)
+          ;;
       esac
     fi
-    modify_service_conf_new_content="${modify_service_conf_new_content}${modify_service_conf_line}"$'\n'
+    modify_service_conf_new_content=$(printf "%s\n" "${modify_service_conf_new_content}${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then

From fddc166a9a4a53494ac78a9a4ea517f1c0483723 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Mon, 28 Aug 2023 00:05:50 -0500
Subject: [PATCH 41/47] fix

---
 raspberrypi/disable_login_prompt.sh | 4 ++--
 raspberrypi/enable_login_prompt.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index c5c24a9..fa05850 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -35,14 +35,14 @@ modify_service_conf() {
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n" "${modify_service_conf_new_content}${modify_service_conf_line}")
+    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
     exit 1
   fi
 
-  printf "%s" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
+  printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
 }
 
 modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "add" "--skip-login"
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index 4a7a912..b2ab004 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -35,14 +35,14 @@ modify_service_conf() {
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n" "${modify_service_conf_new_content}${modify_service_conf_line}")
+    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
     exit 1
   fi
 
-  printf "%s" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
+  printf "%s\n" "${modify_service_conf_new_content}" > "${modify_service_conf_file}"
 }
 
 modify_service_conf "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "ExecStart=-/sbin/agetty" "del" "--skip-login"

From 25f488a076724cce2a3a437404ee05627068ee5e Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Mon, 28 Aug 2023 00:08:26 -0500
Subject: [PATCH 42/47] quots for the quot gods

---
 raspberrypi/disable_login_prompt.sh | 2 +-
 raspberrypi/enable_login_prompt.sh  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index fa05850..2a14153 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -35,7 +35,7 @@ modify_service_conf() {
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
+    modify_service_conf_new_content="$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")"
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then
diff --git a/raspberrypi/enable_login_prompt.sh b/raspberrypi/enable_login_prompt.sh
index b2ab004..736c7e4 100755
--- a/raspberrypi/enable_login_prompt.sh
+++ b/raspberrypi/enable_login_prompt.sh
@@ -6,8 +6,8 @@ modify_service_conf() {
   modify_service_conf_subcommand="$3"
   modify_service_conf_flag="$4"
 
-  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[\\/&]/\\&/g')
-  modify_service_conf_linePrefix_escaped=$(echo "${modify_service_conf_linePrefix}" | sed -e 's/[\\/&]/\\&/g')
+  modify_service_conf_flag_escaped="$(echo "${modify_service_conf_flag}" | sed -e 's/[\\/&]/\\&/g')"
+  modify_service_conf_linePrefix_escaped="$(echo "${modify_service_conf_linePrefix}" | sed -e 's/[\\/&]/\\&/g')"
 
   if [ ! -f "${modify_service_conf_file}" ]; then
     exit 1
@@ -28,14 +28,14 @@ modify_service_conf() {
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')
+          remaining_line="$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')"
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
         *)
           ;;
       esac
     fi
-    modify_service_conf_new_content=$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")
+    modify_service_conf_new_content="$(printf "%s\n%s" "${modify_service_conf_new_content}" "${modify_service_conf_line}")"
   done < "${modify_service_conf_file}"
 
   if [ "${modify_service_conf_found}" -eq 0 ]; then

From fc5516719835ef444065f1cb009cb96703f02d05 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Mon, 28 Aug 2023 00:11:42 -0500
Subject: [PATCH 43/47] disbale to

---
 raspberrypi/disable_login_prompt.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/raspberrypi/disable_login_prompt.sh b/raspberrypi/disable_login_prompt.sh
index 2a14153..751e3ee 100755
--- a/raspberrypi/disable_login_prompt.sh
+++ b/raspberrypi/disable_login_prompt.sh
@@ -6,8 +6,8 @@ modify_service_conf() {
   modify_service_conf_subcommand="$3"
   modify_service_conf_flag="$4"
 
-  modify_service_conf_flag_escaped=$(echo "${modify_service_conf_flag}" | sed -e 's/[\\/&]/\\&/g')
-  modify_service_conf_linePrefix_escaped=$(echo "${modify_service_conf_linePrefix}" | sed -e 's/[\\/&]/\\&/g')
+  modify_service_conf_flag_escaped="$(echo "${modify_service_conf_flag}" | sed -e 's/[\\/&]/\\&/g')"
+  modify_service_conf_linePrefix_escaped="$(echo "${modify_service_conf_linePrefix}" | sed -e 's/[\\/&]/\\&/g')"
 
   if [ ! -f "${modify_service_conf_file}" ]; then
     exit 1
@@ -28,7 +28,7 @@ modify_service_conf() {
           fi
           ;;
         del|delete)
-          remaining_line=$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')
+          remaining_line="$(echo "${remaining_line}" | sed "s/[[:space:]]*${modify_service_conf_flag_escaped}[[:space:]]*/ /g" | awk '{$1=$1};1')"
           modify_service_conf_line="${modify_service_conf_linePrefix} ${remaining_line}"
           ;;
         *)

From c63bbc626c4059ddb6af8bdfe483b6f993ed2925 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Mon, 28 Aug 2023 00:13:52 -0500
Subject: [PATCH 44/47] rename

---
 raspberrypi/{optimize_shutdown.sh => disable_kernel_logs.sh} | 0
 raspberrypi/optimize.sh                                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename raspberrypi/{optimize_shutdown.sh => disable_kernel_logs.sh} (100%)

diff --git a/raspberrypi/optimize_shutdown.sh b/raspberrypi/disable_kernel_logs.sh
similarity index 100%
rename from raspberrypi/optimize_shutdown.sh
rename to raspberrypi/disable_kernel_logs.sh
diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 3f20c15..4ee986b 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -4,4 +4,4 @@ curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimiz
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_motd.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_login_prompt.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_cursor.sh" | bash
-curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_shutdown.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_kernel_logs.sh" | bash

From 8e8b168f44a74cfec77ff92c3d112d89b709fa6d Mon Sep 17 00:00:00 2001
From: Drewry Pope <drewrypope@gmail.com>
Date: Wed, 30 Aug 2023 00:42:24 -0500
Subject: [PATCH 45/47] Improve Cursor Visibility (#3)

* disable cursor blink

* Update enable_disabled_cursor_blink.sh

* improve shushing
---
 .gitignore                                  |  3 ++-
 raspberrypi/disable_cursor_blink.sh         | 19 +++++++++++++++++++
 raspberrypi/disable_motd.sh                 |  9 ++++-----
 raspberrypi/enable_disabled_cursor_blink.sh |  8 ++++++++
 raspberrypi/optimize.sh                     |  2 +-
 5 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100755 raspberrypi/disable_cursor_blink.sh
 create mode 100755 raspberrypi/enable_disabled_cursor_blink.sh

diff --git a/.gitignore b/.gitignore
index 496ee2c..80abc54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+tags
diff --git a/raspberrypi/disable_cursor_blink.sh b/raspberrypi/disable_cursor_blink.sh
new file mode 100755
index 0000000..24561d9
--- /dev/null
+++ b/raspberrypi/disable_cursor_blink.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cat <<EOL > "/etc/systemd/system/stop-cursor-blink.service"
+[Unit]
+Description=Stop cursor blink on Linux console
+DefaultDependencies=no
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c "echo 0 > /sys/class/graphics/fbcon/cursor_blink"
+
+[Install]
+WantedBy=sysinit.target
+EOL
+
+systemctl daemon-reload
+systemctl enable stop-cursor-blink.service
+systemctl start stop-cursor-blink.service
diff --git a/raspberrypi/disable_motd.sh b/raspberrypi/disable_motd.sh
index 76dff17..728efee 100755
--- a/raspberrypi/disable_motd.sh
+++ b/raspberrypi/disable_motd.sh
@@ -1,16 +1,15 @@
 #!/bin/sh
 
-sudo_user=${SUDO_USER:-$(whoami)}
-sudo_user_home=$(eval echo "~${sudo_user}")
-
-touch "${sudo_user_home}/.hushlogin"
-
 DATE="$(date +%s)"
 
 if [ -z "${DATE}" ]; then
   DATE=default
 fi
 
+getent passwd |
+    awk -F: '($3 >= 1000 || $3 == 0) && $7 !~ /nologin|false$/ { print $6 "/.hushlogin" }' |
+    xargs -I {} sh -c "echo '${DATE}' | tee -a {} > /dev/null"
+
 if [ -e "/etc/update-motd.d/10-uname" ]; then
   chmod -x /etc/update-motd.d/10-uname*
   mv -f "/etc/update-motd.d/10-uname" "/etc/update-motd.d/10-uname.backup.${DATE}"
diff --git a/raspberrypi/enable_disabled_cursor_blink.sh b/raspberrypi/enable_disabled_cursor_blink.sh
new file mode 100755
index 0000000..4c8ff27
--- /dev/null
+++ b/raspberrypi/enable_disabled_cursor_blink.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if systemctl list-units --full -all | grep -q "stop-cursor-blink.service"; then
+  systemctl disable stop-cursor-blink.service
+fi
+
+rm /etc/systemd/system/stop-cursor-blink.service
+systemctl daemon-reload
diff --git a/raspberrypi/optimize.sh b/raspberrypi/optimize.sh
index 4ee986b..7d1662f 100755
--- a/raspberrypi/optimize.sh
+++ b/raspberrypi/optimize.sh
@@ -3,5 +3,5 @@
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/optimize_boot.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_motd.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_login_prompt.sh" | bash
-curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_cursor.sh" | bash
+curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_cursor_blink.sh" | bash
 curl -s "https://raw.githubusercontent.com/beeper/beepy/main/raspberrypi/disable_kernel_logs.sh" | bash

From 0ef5b0bb1f04b851abede78e595c9b4f84f43f30 Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Wed, 30 Aug 2023 01:49:10 -0500
Subject: [PATCH 46/47] disable disables

---
 raspberrypi/disable_cursor_blink.sh         | 8 ++++----
 raspberrypi/enable_disabled_cursor_blink.sh | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/raspberrypi/disable_cursor_blink.sh b/raspberrypi/disable_cursor_blink.sh
index 24561d9..ecab8b8 100755
--- a/raspberrypi/disable_cursor_blink.sh
+++ b/raspberrypi/disable_cursor_blink.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-cat <<EOL > "/etc/systemd/system/stop-cursor-blink.service"
+cat <<EOL > "/etc/systemd/system/disable-cursor-blink.service"
 [Unit]
-Description=Stop cursor blink on Linux console
+Description=Disable cursor blink on Linux console
 DefaultDependencies=no
 Before=sysinit.target
 
@@ -15,5 +15,5 @@ WantedBy=sysinit.target
 EOL
 
 systemctl daemon-reload
-systemctl enable stop-cursor-blink.service
-systemctl start stop-cursor-blink.service
+systemctl enable disable-cursor-blink.service
+systemctl start disable-cursor-blink.service
diff --git a/raspberrypi/enable_disabled_cursor_blink.sh b/raspberrypi/enable_disabled_cursor_blink.sh
index 4c8ff27..10ea07c 100755
--- a/raspberrypi/enable_disabled_cursor_blink.sh
+++ b/raspberrypi/enable_disabled_cursor_blink.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-if systemctl list-units --full -all | grep -q "stop-cursor-blink.service"; then
-  systemctl disable stop-cursor-blink.service
+if systemctl list-units --full -all | grep -q "disable-cursor-blink.service"; then
+  systemctl disable disable-cursor-blink.service
 fi
 
-rm /etc/systemd/system/stop-cursor-blink.service
+rm /etc/systemd/system/disable-cursor-blink.service
 systemctl daemon-reload

From db0a3f666a4618ea9462dd102e35fbdccdfe071d Mon Sep 17 00:00:00 2001
From: drewry pope <drewrypope@gmail.com>
Date: Wed, 30 Aug 2023 01:50:56 -0500
Subject: [PATCH 47/47] safe

---
 raspberrypi/enable_disabled_cursor_blink.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raspberrypi/enable_disabled_cursor_blink.sh b/raspberrypi/enable_disabled_cursor_blink.sh
index 10ea07c..5528016 100755
--- a/raspberrypi/enable_disabled_cursor_blink.sh
+++ b/raspberrypi/enable_disabled_cursor_blink.sh
@@ -4,5 +4,5 @@ if systemctl list-units --full -all | grep -q "disable-cursor-blink.service"; th
   systemctl disable disable-cursor-blink.service
 fi
 
-rm /etc/systemd/system/disable-cursor-blink.service
+rm -f /etc/systemd/system/disable-cursor-blink.service
 systemctl daemon-reload