Skip to content

Commit a0d627a

Browse files
committed
Fix up noble-numbat install npm and fakeroot
Also don't need to look for createrepo any longer. None of the deb distros have nowadays.
1 parent 361e07e commit a0d627a

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

bin/apt-dependencies.sh

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,21 @@ apt-get install --no-install-recommends -y apt-transport-https curl git pkg-conf
6969
libicu-dev libnspr4-dev \
7070
help2man curl debhelper devscripts dh-exec dh-python equivs \
7171
dialog equivs lintian libwww-perl quilt \
72-
reprepro rsync \
72+
reprepro fakeroot rsync \
7373
vim-tiny screen procps dirmngr ssh-client
7474

7575

76-
# createrepo_c or createrepo, depending on packaging support
77-
if [ "${VERSION_CODENAME}" == "noble" ] || [ "${VERSION_CODENAME}" == "bullseye" ] || [ "${VERSION_CODENAME}" == "bookworm" ]; then
78-
apt-get install --no-install-recommends -y createrepo-c || true
79-
else
80-
# python 2 based; gone from focal / bullseye / bookworm. look for createrepo_c eventually
81-
# hopefully via: https://github.com/rpm-software-management/createrepo_c/issues/145
82-
apt-get install --no-install-recommends -y createrepo || true
83-
fi
76+
# createrepo_c is optional, all distros have it except focal
77+
# once focal is dropped can just added to the list above
78+
#
79+
apt-get install --no-install-recommends -y createrepo-c || true
80+
8481

8582
# Node.js (ubuntu noble has version 18, otherwise build a package)
8683

8784
if [ "${VERSION_CODENAME}" == "noble" ] && [ "${NODEVERSION}" == "18" ]; then
8885
echo "--- Ubuntu Noble (24.04) has NodeJS 18 so we just install it from there"
89-
apt-get install --no-install-recommends -y nodejs
86+
apt-get install --no-install-recommends -y nodejs npm
9087
else
9188
wget https://deb.nodesource.com/setup_${NODEVERSION}.x
9289
if /bin/bash setup_${NODEVERSION}.x; then

0 commit comments

Comments
 (0)