add scripts to control

Author: ipitio

.github/workflows/release.yml

@@ -51,10 +51,10 @@ jobs:
         id: build
         run: |
           sed -i "s,^Description:,Files:$(find . -type f | grep -oP '(?<=^\./).*' | grep -vP '^(\.|debian/)' | while read -r file; do echo -e " $file /opt/closure/$file"; done | grep -oP '.*(?=/)' | awk -v ORS='\\n' '1')Description:," debian/control
-          sed -i "s,^Files:,Files:$(find . -type f | grep -oP '(?<=^\./).*' | grep -P '(?<=^debian/).+' | while read -r file; do echo -e " $file /opt/closure/DEBIAN/$file"; done | grep -oP '.*(?=/)' | awk -v ORS='\\n' '1')," debian/control
+          sed -i "s,^Files:,Files:$(find . -type f | grep -oP '(?<=^\./).*' | grep -oP '(?<=^debian/).+' | while read -r file; do echo -e " debian/$file /opt/closure/debian/$file"; done | grep -oP '.*(?=/)' | awk -v ORS='\\n' '1')," debian/control
           sudo apt-get update
           sudo apt-get install -y equivs
-          equivs-build debian/control
+          sudo equivs-build debian/control
           echo -e "built=$?\ntag=$(grep -oP '(?<=^Version: ).*' debian/control)\nmessage=$(git log -1 --pretty=%B)\n" >> "$GITHUB_OUTPUT"
 
       - name: Create release

bs.sh

@@ -1,21 +1,96 @@
 #!/bin/bash
+# shellcheck disable=SC1091,SC2009,SC2015
+
+sudonot() {
+    # shellcheck disable=SC2068
+    if command -v sudo >/dev/null; then
+        sudo -E "${@:-:}" || "${@:-:}"
+    else
+        "${@:-:}"
+    fi
+}
+
+apt_install() {
+    if ! dpkg -s "$@" &>/dev/null; then
+        sudonot apt-get update
+        export DEBIAN_FRONTEND=noninteractive
+        sudonot apt-get install -yqq "$@"
+        DEBIAN_FRONTEND=
+    fi
+}
+
+this_dir=$(dirname "$(readlink -f "$0")")
+pids=$(ps -o ppid=$$)
+ps -aux | grep -P "^[^-]+$this_dir/bs.sh" | awk '{print $2}' | while read -r pid; do grep -q "$pid" <<<"$pids" || sudonot kill -9 "$pid" &>/dev/null; done
+
+if ! dpkg -s apt-fast &>/dev/null; then
+    sudonot add-apt-repository -y ppa:apt-fast/stable
+    sudonot apt-get update
+    sudonot DEBIAN_FRONTEND=noninteractive apt-get install -yq apt-fast
+fi
+
+if ! dpkg -s docker-ce &>/dev/null; then
+    apt_install ca-certificates curl
+    sudonot install -m 0755 -d /etc/apt/keyrings
+    sudonot curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+    sudonot chmod a+r /etc/apt/keyrings/docker.asc
+    echo "deb [trusted=yes arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | sudonot tee /etc/apt/sources.list.d/docker.list >/dev/null
+fi
+
+if ! dpkg -s closure &>/dev/null; then
+    sudonot mkdir -m 0755 -p /etc/apt/keyrings/
+    wget -qO- https://ipitio.github.io/closure/gpg.key | gpg --dearmor | sudonot tee /etc/apt/keyrings/closure.gpg >/dev/null
+    echo "deb [signed-by=/etc/apt/keyrings/closure.gpg] https://ipitio.github.io/closure master main" | sudonot tee /etc/apt/sources.list.d/closure.list &>/dev/null
+    sudonot chmod 644 /etc/apt/keyrings/closure.gpg
+    sudonot chmod 644 /etc/apt/sources.list.d/closure.list
+fi
+
+[ ! -f /etc/apt/preferences.d/nosnap.pref ] || sudonot mv /etc/apt/preferences.d/nosnap.pref /etc/apt/preferences.d/nosnap.pref.bak
+sudonot systemctl disable --now whoopsie.path &>/dev/null
+sudonot systemctl mask whoopsie.path &>/dev/null
+sudonot apt-get purge -y ubuntu-report popularity-contest apport whoopsie
+# shellcheck disable=SC2046
+apt_install closure $(grep -oP '((?<=^Depends: )|(?<=^Recommends: )|(?<=^Suggests: )).*' debian/control | tr -d ',' | tr '\n' ' ')
+sudonot apt autoremove -y
+yq -V | grep -q mikefarah &>/dev/null || {
+    [ ! -f /usr/bin/yq ] || sudonot mv -f /usr/bin/yq /usr/bin/yq.bak
+    arch=$(uname -m)
+    [ "$arch" = "x86_64" ] && arch="amd64" || :
+    [ "$arch" = "aarch64" ] && arch="arm64" || :
+    [ "$arch" = "armv7l" ] && arch="armhf" || :
+    [ "$arch" = "armhf" ] && arch="arm" || :
+    [[ "$arch" == "i686" || "$arch" == "i386" ]] && arch="386" || :
+    sudonot curl -LNZo /usr/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_"$arch"
+    sudonot chmod +x /usr/bin/yq
+}
+flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+flatpak install --noninteractive flathub tv.kodi.Kodi
+[ ! -f /.dockerenv ] || exit 0
+
+# wifi performance
+echo "[connection]
+# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
+wifi.powersave = 2
+" | sudonot tee /etc/NetworkManager/conf.d/wifi-powersave.conf >/dev/null
+sudonot 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 ] || sudonot sed -i "s/uri=.*$/uri=/" /lib/NetworkManager/conf.d/20-connectivity-ubuntu.conf
 
 if grep -q Raspberry /proc/device-tree/model; 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
+    grep -q dtoverlay=disable-bt /boot/firmware/config.txt || echo "dtoverlay=disable-bt" | sudonot tee -a /boot/firmware/config.txt >/dev/null
 
     if [ ! -f /etc/modprobe.d/brcmfmac.conf ]; then
         # wifi chip bug: https://github.com/raspberrypi/linux/issues/6049#issuecomment-2642566713
-        echo "options brcmfmac roamoff=1 feature_disable=0x202000" | sudo tee /etc/modprobe.d/brcmfmac.conf >/dev/null
-        sudo systemctl restart systemd-modules-load
+        echo "options brcmfmac roamoff=1 feature_disable=0x202000" | sudonot tee /etc/modprobe.d/brcmfmac.conf >/dev/null
+        sudonot systemctl restart systemd-modules-load
     fi
 fi
 
 # Verbose boot
 if [ -f /etc/default/grub ] && grep -q "quiet splash" /etc/default/grub; then
-    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
+    sudonot sed -i 's/quiet splash//g' /etc/default/grub
+    grep -q "GRUB_CMDLINE_LINUX_DEFAULT" /etc/default/grub || echo "GRUB_CMDLINE_LINUX_DEFAULT=\"\"" | sudonot tee -a /etc/default/grub >/dev/null
+    grep -q "nosplash debug --verbose" /etc/default/grub || echo "GRUB_CMDLINE_LINUX=\"nosplash debug --verbose\"" | sudonot tee -a /etc/default/grub >/dev/null
+    sudonot update-grub
 fi

debian/control

@@ -4,13 +4,15 @@ Homepage: https://github.com/ipitio/closure
 Standards-Version: 3.9.2
 
 Package: closure
-Version: 1.6.30
+Version: 1.7
 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
 Suggests: build-essential, byobu, dkms, iperf3, nmap, tmux, traceroute, wmctrl
 Copyright: debian/copyright
 Readme: debian/README.Debian
+Postinst: debian/postinst
+Prerm: debian/prerm
 Links: /usr/share/doc/closure /opt/closure/debian
 Description: Provision a fresh Ubuntu install as a Hub, Spoke, or hybrid of both!
  You can run WireGuard with Docker or on the host.

debian/postinst

@@ -1,9 +1,9 @@
 #!/bin/bash
-# shellcheck disable=SC1003,SC1091
+# shellcheck disable=SC1091
 
 pushd /opt/closure || exit 1
-[[ ! -f /etc/rc.local || -f /etc/rc.local.bak ]] || sudo mv -f /etc/rc.local /etc/rc.local.bak
-cp rc.local /etc/rc.local
 [ ! -f installed ] || rm -rf installed
+[[ ! -f /etc/rc.local || -f /etc/rc.local.bak ]] || sudo mv -f /etc/rc.local /etc/rc.local.bak
+cp -f rc.local /etc/rc.local
 source "bs.sh"
 popd || exit 1

debian/prerm

@@ -1,3 +1,9 @@
 #!/bin/bash
 
-: # TODO
+pushd /opt/closure || exit 1
+[ ! -f installed ] || rm -rf installed
+! grep /opt/closure /etc/rc.local &>/dev/null || [ ! -f /etc/rc.local.bak ] || mv -f /etc/rc.local.bak /etc/rc.local
+! grep /opt/closure /etc/rc.local &>/dev/null || rm -f /etc/rc.local
+grep -oP '^(Files:)? [^ ]+(?= /opt/closure)' debian/control | grep -oP '(?<= ).+' | while read -r file; do [ ! -f "$file" ] || rm -f "$file"; done
+find . -type d -empty -delete
+popd || exit 1

examples/compose.yml

@@ -48,7 +48,7 @@ services:
       dockerfile_inline: |
         FROM ghcr.io/arevindh/pihole-speedtest:latest
         RUN apt-get install -y php-cli php-sqlite3 php-intl php-curl wget || { apt-get update && apt-get install -y php-cli php-sqlite3 php-intl php-curl wget; }
-        RUN curl -sSLNZ https://raw.githubusercontent.com/jacklul/pihole-updatelists/master/install.sh | sudo bash -s docker
+        RUN curl -sSLNZ https://raw.githubusercontent.com/jacklul/pihole-updatelists/pihole-v5/install.sh | sudo bash -s docker
     container_name: pihole
     restart: unless-stopped
     platform: linux/amd64