Skip to content

Commit 476effb

Browse files
committed
fix dpkg check
1 parent fd88602 commit 476effb

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

bs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,7 @@ fi
1515
# Verbose boot
1616
if [ -f /etc/default/grub ] && grep -q "quiet splash" /etc/default/grub; then
1717
sudo sed -i 's/quiet splash//g' /etc/default/grub
18+
grep -q "GRUB_CMDLINE_LINUX_DEFAULT" /etc/default/grub || echo "GRUB_CMDLINE_LINUX_DEFAULT=\"\"" | sudo tee -a /etc/default/grub >/dev/null
19+
grep -q "nosplash debug --verbose" /etc/default/grub || echo "GRUB_CMDLINE_LINUX=\"nosplash debug --verbose\"" | sudo tee -a /etc/default/grub >/dev/null
1820
sudo update-grub
1921
fi

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
44
Standards-Version: 3.9.2
55

66
Package: closure
7-
Version: 1.6.27
7+
Version: 1.6.28
88
Maintainer: ipitio <21136719+ipitio@users.noreply.github.com>
99
Depends: curl, flatpak, gpg, hostapd, isc-dhcp-server, iw, macchanger, netplan.io, network-manager, net-tools, qrencode, rfkill, wireguard, wireless-tools, wget
1010
Recommends: containerd.io, docker-ce, docker-ce-cli, docker-buildx-plugin, docker-compose-plugin

init.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sudonot() {
1111
}
1212

1313
apt_install() {
14-
if ! dpkg -l "$@" >/dev/null 2>&1; then
14+
if ! dpkg -s "$@" &>/dev/null; then
1515
sudonot apt-get update
1616
export DEBIAN_FRONTEND=noninteractive
1717
sudonot apt-get install -yqq "$@"
@@ -28,21 +28,21 @@ ps -aux | grep -P "^[^-]+$this_dir/init.sh" | awk '{print $2}' | while read -r p
2828
mv -n examples/* . 2>/dev/null
2929
rmdir examples 2>/dev/null
3030

31-
if ! dpkg -l apt-fast >/dev/null 2>&1; then
31+
if ! dpkg -s apt-fast &>/dev/null; then
3232
sudonot add-apt-repository -y ppa:apt-fast/stable
3333
sudonot apt-get update
3434
sudonot DEBIAN_FRONTEND=noninteractive apt-get install -yq apt-fast
3535
fi
3636

37-
if ! dpkg -l docker-ce >/dev/null 2>&1; then
37+
if ! dpkg -s docker-ce &>/dev/null; then
3838
apt_install ca-certificates curl
3939
sudonot install -m 0755 -d /etc/apt/keyrings
4040
sudonot curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
4141
sudonot chmod a+r /etc/apt/keyrings/docker.asc
4242
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
4343
fi
4444

45-
if ! dpkg -l closure >/dev/null 2>&1; then
45+
if ! dpkg -s closure &>/dev/null; then
4646
sudonot mkdir -m 0755 -p /etc/apt/keyrings/
4747
wget -qO- https://ipitio.github.io/closure/gpg.key | gpg --dearmor | sudonot tee /etc/apt/keyrings/closure.gpg >/dev/null
4848
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

0 commit comments

Comments
 (0)