Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Remove use of apt #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove use of apt #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a72edc
Change "apt install" to "apt-get install"
Aug 10, 2020
89c689f
Use dpkg instead of apt to determine if packages are installed
Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions desktopify
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ EOM

function enable_oem() {
if [ "${ENABLE_OEM}" -eq 1 ] && [ "${DESKTOP_ENVIRONMENT}" != "lubuntu" ]; then
apt -y install whois
apt-get -y install whois
local DATE=""
DATE=$(date +%m%H%M%S)
local PASSWD=""
Expand Down Expand Up @@ -230,11 +230,11 @@ fi
HARDWARE_PACKAGES=(libgles1 libopengl0 libxvmc1 pi-bluetooth libgpiod-dev python3-libgpiod python3-gpiozero)

#Check if system already has a desktop installed
if [ "$(apt list --installed ${DESKTOP_PACKAGES} 2>/dev/null | grep installed)" ] && [ "${FORCE}" -eq 0 ]; then
if [[ ${FORCE} -eq 0 ]] && { dpkg -l "${DESKTOP_PACKAGES}" &>/dev/null; }; then
echo "[*] WARNING: ${DESKTOP_PACKAGES} already installed. To force install use the --force option."
else
echo "[+] Will now install ${DESKTOP_PACKAGES}"
apt install -y ${DESKTOP_PACKAGES}^
apt-get -y install ${DESKTOP_PACKAGES}^
fi

for CLASSIC_SNAP in "${CLASSIC_SNAPS[@]}"; do
Expand All @@ -246,7 +246,7 @@ for CONFINED_SNAP in "${CONFINED_SNAPS[@]}"; do
done

echo "[+] Will now install ${HARDWARE_PACKAGES[*]}"
apt install -y "${HARDWARE_PACKAGES[@]}"
apt-get -y install "${HARDWARE_PACKAGES[@]}"

configure_network
apply_tweaks
Expand Down