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.

Sign up for GitHub

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: adapt setup scripts to run properly on distrobox #1687

Merged
merged 7 commits into from
Nov 6, 2024
Merged

fix: adapt setup scripts to run properly on distrobox #1687

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14a1689
fix: install missing packages during setup
imobachgs Oct 21, 2024
ee738d3
fix: update symbolic links during setup
imobachgs Oct 21, 2024
8794454
fix: support for distrobox in the setup scripts
imobachgs Oct 21, 2024
a9a9efe
fix: force symbolic links creation during setup
imobachgs Oct 21, 2024
98dab80
fix(setup): use the system D-Bus in distrobox
imobachgs Oct 24, 2024
9405f2b
fix(setup): do not use pre-installed gems in distrobox
imobachgs Nov 5, 2024
cc8aa93
fix(setup): use sudo when needed
imobachgs Nov 6, 2024
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
23 changes: 19 additions & 4 deletions setup-services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ZYPPER="zypper --non-interactive -v"
$SUDO $ZYPPER install \
gcc \
gcc-c++ \
git \
make \
openssl-devel \
ruby-devel \
Expand Down Expand Up @@ -116,14 +117,15 @@ fi
sed -e '/gemspec/a gem "ruby-dbus", path: "/checkout-ruby-dbus"' -i Gemfile
fi

if [ -n "$CI" ]; then
if [ -n "${CI:-}" ]; then
# in CI reuse the pre-installed system gems from RPMs
bundle config set --local disable_shared_gems 0
$SUDO bundle install
else
bundle config set --local path 'vendor/bundle'
bundle install
fi

bundle install
)

# Rust service, CLI and auto-installation.
Expand All @@ -137,6 +139,7 @@ $SUDO $ZYPPER install \
gzip \
jsonnet \
lshw \
NetworkManager \
pam-devel \
python-langtable-data \
tar \
Expand All @@ -147,7 +150,7 @@ $SUDO $ZYPPER install \
cd $MYDIR/rust
cargo build

ln -st /usr/bin $MYDIR/rust/target/debug/agama{,*server}
$SUDO ln -sft /usr/bin $MYDIR/rust/target/debug/agama{,*server}
)

# - D-Bus configuration
Expand Down Expand Up @@ -192,7 +195,19 @@ $SUDO mkdir -p /usr/share/agama/products.d
$SUDO cp -f $MYDIR/products.d/*.yaml /usr/share/agama/products.d

# - Make sure NetworkManager is running
$SUDO systemctl start NetworkManager
if [ -n "${DISTROBOX_ENTER_PATH:-}" ]; then
AGAMA_WEB_SERVER_SVC="/usr/lib/systemd/system/agama-web-server.service"
grep -q DBUS_SYSTEM_BUS_ADDRESS $AGAMA_WEB_SERVER_SVC || $SUDO sed -i \
-e '/\[Service\]/a Environment="DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/host/run/dbus/system_bus_socket"' \
$AGAMA_WEB_SERVER_SVC

AGAMA_SVC="/usr/lib/systemd/system/agama.service"
grep -q DBUS_SYSTEM_BUS_ADDRESS $AGAMA_SVC || $SUDO sed -i \
-e '/\[Service\]/a Environment="DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/host/run/dbus/system_bus_socket"' \
$AGAMA_SVC
else
$SUDO systemctl start NetworkManager
fi

# systemd reload and start of service
(
Expand Down