YunoHost/ynh-dev
1
0
Fork 0
mirror of https://github.com/YunoHost/ynh-dev.git synced 2024-09-03 20:05:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #82 from selfhoster1312/no-dep-which

Browse source 
More portable dependency checks
This commit is contained in:
Alexandre Aubin 2024-05-08 18:06:07 +02:00 • committed by GitHub
commit 021514666f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ynh-dev
View file

@ -180,10 +180,10 @@ function prepare_cache_and_deps() {
function check_incus_setup() function check_incus_setup()
{ {
# Check incus is installed somehow # Check incus is installed somehow
if ! which incus &>/dev/null; then if ! command -v incus &>/dev/null; then
critical "You need to have Incus installed for ynh-dev to be usable from the host machine. Refer to the README to know how to install it." critical "You need to have Incus installed for ynh-dev to be usable from the host machine. Refer to the README to know how to install it."
fi fi
if ! id -nG "$(whoami)" | grep -qw "incus-admin"; then if ! id -nG "$(whoami)" | grep -qw "incus-admin" && [ ! $(id -u) -eq 0 ]; then
critical "You need to be in the incus-admin group!" critical "You need to be in the incus-admin group!"
fi fi
@ -195,6 +195,11 @@ function check_incus_setup()
function set_incus_remote() function set_incus_remote()
{ {
# Check jq is installed somehow
if ! command -v jq &>/dev/null; then
critical "You need jq installed for ynh-dev"
fi
configured=$(incus remote list -f json | jq 'has("yunohost")') configured=$(incus remote list -f json | jq 'has("yunohost")')
if [[ "$configured" != "true" ]]; then if [[ "$configured" != "true" ]]; then
incus remote add yunohost https://devbaseimgs.yunohost.org --public incus remote add yunohost https://devbaseimgs.yunohost.org --public
@ -455,7 +460,7 @@ function dev()
{ {
assert_inside_vm assert_inside_vm
which inotifywait &>/dev/null || critical "You should first run: apt install inotify-tools" command -v inotifywait &>/dev/null || critical "You should first run: apt install inotify-tools"
info "Now monitoring for changes in python files, restarting yunohost-api and yunohost-portal-api when changes occur!" info "Now monitoring for changes in python files, restarting yunohost-api and yunohost-portal-api when changes occur!"