Skip to content

Commit dba7ef6

Browse files
authored
[misc] Remove aur support and start service on ostree (#4461)
* Remove aur support and start service on ostree The aur installation was adding many packages and installing more than just the client. For now is best to remove it and rely on binary install Some users complained about ostree installation not starting the client, we add two explicit commands to it * use ${SUDO} * fix if closure
1 parent 69d8734 commit dba7ef6

File tree

1 file changed

+3
-40
lines changed

1 file changed

+3
-40
lines changed

release_files/install.sh

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -130,36 +130,6 @@ repo_gpgcheck=1
130130
EOF
131131
}
132132

133-
install_aur_package() {
134-
INSTALL_PKGS="git base-devel go"
135-
REMOVE_PKGS=""
136-
137-
# Check if dependencies are installed
138-
for PKG in $INSTALL_PKGS; do
139-
if ! pacman -Q "$PKG" > /dev/null 2>&1; then
140-
# Install missing package(s)
141-
${SUDO} pacman -S "$PKG" --noconfirm
142-
143-
# Add installed package for clean up later
144-
REMOVE_PKGS="$REMOVE_PKGS $PKG"
145-
fi
146-
done
147-
148-
# Build package from AUR
149-
cd /tmp && git clone https://aur.archlinux.org/netbird.git
150-
cd netbird && makepkg -sri --noconfirm
151-
152-
if ! $SKIP_UI_APP; then
153-
cd /tmp && git clone https://aur.archlinux.org/netbird-ui.git
154-
cd netbird-ui && makepkg -sri --noconfirm
155-
fi
156-
157-
if [ -n "$REMOVE_PKGS" ]; then
158-
# Clean up the installed packages
159-
${SUDO} pacman -Rs "$REMOVE_PKGS" --noconfirm
160-
fi
161-
}
162-
163133
prepare_tun_module() {
164134
# Create the necessary file structure for /dev/net/tun
165135
if [ ! -c /dev/net/tun ]; then
@@ -276,12 +246,9 @@ install_netbird() {
276246
if ! $SKIP_UI_APP; then
277247
${SUDO} rpm-ostree -y install netbird-ui
278248
fi
279-
;;
280-
pacman)
281-
${SUDO} pacman -Syy
282-
install_aur_package
283-
# in-line with the docs at https://wiki.archlinux.org/title/Netbird
284-
${SUDO} systemctl enable --now [email protected]
249+
# ensure the service is started after install
250+
${SUDO} netbird service install || true
251+
${SUDO} netbird service start || true
285252
;;
286253
pkg)
287254
# Check if the package is already installed
@@ -458,11 +425,7 @@ if type uname >/dev/null 2>&1; then
458425
elif [ -x "$(command -v yum)" ]; then
459426
PACKAGE_MANAGER="yum"
460427
echo "The installation will be performed using yum package manager"
461-
elif [ -x "$(command -v pacman)" ]; then
462-
PACKAGE_MANAGER="pacman"
463-
echo "The installation will be performed using pacman package manager"
464428
fi
465-
466429
else
467430
echo "Unable to determine OS type from /etc/os-release"
468431
exit 1

0 commit comments

Comments
 (0)