update grub timeout

Author: ipitio

bs.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2015
 
 # wifi performance
 echo "[connection]
@@ -8,7 +9,7 @@ wifi.powersave = 2
 sudo cp -f /etc/NetworkManager/conf.d/wifi-powersave.conf /etc/NetworkManager/conf.d/default-wifi-powersave-on.conf
 [ ! -f /lib/NetworkManager/conf.d/20-connectivity-ubuntu.conf ] || sudo sed -i "s/uri=.*$/uri=/" /lib/NetworkManager/conf.d/20-connectivity-ubuntu.conf
 
-if grep -q Raspberry /proc/device-tree/model; then
+if grep -q Raspberry /proc/device-tree/model &>/dev/null; then
 
     # wifi 2.4GHz performance
     grep -q dtoverlay=disable-bt /boot/firmware/config.txt || echo "dtoverlay=disable-bt" | sudo tee -a /boot/firmware/config.txt >/dev/null
@@ -21,9 +22,17 @@ if grep -q Raspberry /proc/device-tree/model; then
 fi
 
 # Verbose boot
-if [ -f /etc/default/grub ] && grep -q "quiet splash" /etc/default/grub; then
+if [ -f /etc/default/grub ]; then
+    sudo cp -f /etc/default/grub /etc/default/grub.bak
     sudo sed -i 's/quiet splash//g' /etc/default/grub
-    grep -q "GRUB_CMDLINE_LINUX_DEFAULT" /etc/default/grub || echo "GRUB_CMDLINE_LINUX_DEFAULT=\"\"" | sudo tee -a /etc/default/grub >/dev/null
-    grep -q "nosplash debug --verbose" /etc/default/grub || echo "GRUB_CMDLINE_LINUX=\"nosplash debug --verbose\"" | sudo tee -a /etc/default/grub >/dev/null
-    sudo update-grub
+
+    if grep -q "GRUB_CMDLINE_LINUX_DEFAULT" /etc/default/grub; then
+        grep -q "nosplash debug --verbose" /etc/default/grub || sudo sed -i 's/^GRUB_CMDLINE_LINUX="\(.*\)/GRUB_CMDLINE_LINUX="nosplash debug --verbose \1/' /etc/default/grub
+    else
+        echo "GRUB_CMDLINE_LINUX_DEFAULT=\"nosplash debug --verbose\"" | sudo tee -a /etc/default/grub >/dev/null
+    fi
+
+    grep -q "GRUB_TIMEOUT=" /etc/default/grub && sudo sed -i 's/^GRUB_TIMEOUT=0/GRUB_TIMEOUT=3/' /etc/default/grub || echo "GRUB_TIMEOUT=3" | sudo tee -a /etc/default/grub >/dev/null
+    diff /etc/default/grub.bak /etc/default/grub >/dev/null || sudo update-grub
+    sudo rm -f /etc/default/grub.bak
 fi

debian/control

@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
 Standards-Version: 3.9.2
 
 Package: closure
-Version: 1.7.1
+Version: 1.7.2
 Maintainer: ipitio <[email protected]>
 Depends: curl, flatpak, gpg, hostapd, isc-dhcp-server, iw, macchanger, netplan.io, network-manager, net-tools, qrencode, rfkill, wireguard, wireless-tools, wget
 Recommends: containerd.io, docker-ce, docker-ce-cli, docker-buildx-plugin, docker-compose-plugin

debian/prerm

@@ -6,5 +6,5 @@ pushd /opt/closure || exit 1
 ! grep /opt/closure /etc/rc.local &>/dev/null || rm -f /etc/rc.local
 grep -oP '^(Files:)? [^ ]+(?= /opt/closure)' debian/control | grep -oP '(?<= ).+' | sed -r 's/^debian\//DEBIAN\//g' | while read -r file; do [ ! -f "$file" ] || rm -f "$file"; done
 find . -type d -empty -delete
-[ ! -f /usr/share/doc/closure ] || rm -f /usr/share/doc/closure
+[ ! -d /usr/share/doc/closure ] || rm -rf /usr/share/doc/closure
 popd || exit 1