Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix future3 installation for bookworm #2100

Merged
merged 5 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 3 additions & 2 deletions installation/routines/setup_jukebox_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ _jukebox_core_install_os_dependencies() {
python3-rpi.gpio python3-gpiozero \
espeak ffmpeg mpg123 \
pulseaudio pulseaudio-module-bluetooth pulseaudio-utils caps \
libasound2-dev \
--no-install-recommends \
--allow-downgrades \
--allow-remove-essential \
Expand Down Expand Up @@ -99,7 +100,7 @@ _jukebox_core_build_and_install_pyzmq() {
fi

sudo ZMQ_PREFIX="${ZMQ_PREFIX}" ZMQ_DRAFT_API=1 \
pip3 install --no-cache-dir --no-binary "pyzmq" --pre pyzmq
pip3 install --no-cache-dir --no-binary "pyzmq" --pre --break-system-packages pyzmq
s-martin marked this conversation as resolved.
Show resolved Hide resolved
else
echo " Skipping. pyzmq already installed"
fi
Expand All @@ -108,7 +109,7 @@ _jukebox_core_build_and_install_pyzmq() {
_jukebox_core_install_python_requirements() {
echo " Install requirements"
cd "${INSTALLATION_PATH}" || exit_on_error
sudo pip3 install --no-cache-dir -r "${INSTALLATION_PATH}/requirements.txt"
sudo pip3 install --no-cache-dir --break-system-packages -r "${INSTALLATION_PATH}/requirements.txt"
}

_jukebox_core_install_settings() {
Expand Down
16 changes: 11 additions & 5 deletions installation/routines/setup_jukebox_webapp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
GD_ID_COMPILED_WEBAPP="1EE_1MdneGtKL5V7GyYZC0nb6ODQWTsPb" # https://drive.google.com/file/d/1EE_1MdneGtKL5V7GyYZC0nb6ODQWTsPb/view?usp=sharing

# For ARMv7+
NODE_SOURCE="https://deb.nodesource.com/setup_16.x"
NODE_MAJOR=16
# For ARMv6
# To update version, follow these links
# https://github.com/sdesalas/node-pi-zero
Expand All @@ -26,12 +26,18 @@ _jukebox_webapp_install_node() {
# Zero and older versions of Pi with ARMv6 only
# support experimental NodeJS
if [[ $(uname -m) == "armv6l" ]]; then
NODE_SOURCE=${NODE_SOURCE_EXPERIMENTAL}
wget -O - ${NODE_SOURCE_EXPERIMENTAL} | sudo bash
sudo apt-get -qq -y install nodejs
sudo npm install --silent -g npm
else
# install NodeJS and npm as recommended in
# https://github.com/nodesource/distributions
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
sudo apt-get update
sudo apt-get install nodejs npm -y
Comment on lines +33 to +38
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the installation guide, we would have to do the following as well.

sudo apt-get install -y ca-certificates curl gnupg
sudo mkdir -p /etc/apt/keyrings

Did you omit those 2 lines on purpose?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are standard libraries that have been installed already, probably due to previous installation steps (or eventually even as part of raspbian already)

fi

wget -O - ${NODE_SOURCE} | sudo bash
sudo apt-get -qq -y install nodejs
sudo npm install --silent -g npm
fi
}

Expand Down