diff --git a/scripts/install b/scripts/install index f3a6ecc..96e56e8 100755 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,7 @@ ynh_exec_warn_less yunohost firewall allow --no-upnp Both 67 #================================================= ynh_script_progression --message="Installing dependencies..." --time --weight=1 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -70,7 +70,7 @@ ynh_script_progression --message="Building lxd from sources..." --time --weight= pushd ${lxd_tmp} -make deps +ynh_exec_warn_less make deps export CGO_CFLAGS="-I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" export CGO_LDFLAGS="-L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" @@ -80,7 +80,7 @@ cd $GOPATH/src/github.com/lxc/lxd # https://github.com/golang/go/issues/31997#issuecomment-782864390 go env -w GO111MODULE=auto -make +ynh_exec_warn_less make mkdir -p /usr/local/lib/$app mkdir -p /var/log/$app diff --git a/scripts/remove b/scripts/remove index fad2445..d1a75f8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -36,7 +36,7 @@ ynh_script_progression --message="Stopping and removing the systemd service..." # Remove the dedicated systemd config ynh_remove_systemd_socket_config -ynh_remove_systemd_config +ynh_exec_warn_less ynh_remove_systemd_config #================================================= # REMOVE DEPENDENCIES @@ -44,7 +44,7 @@ ynh_remove_systemd_config ynh_script_progression --message="Removing dependencies..." --time --weight=1 # Remove metapackage and its dependencies -ynh_remove_app_dependencies +ynh_exec_warn_less ynh_remove_app_dependencies #================================================= # CLOSE A PORT diff --git a/scripts/restore b/scripts/restore index a333ff0..d4461f8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -53,7 +53,7 @@ ynh_exec_warn_less yunohost firewall allow --no-upnp Both 67 ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE SYSTEMD diff --git a/scripts/upgrade b/scripts/upgrade index 04f5545..fc9a259 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,8 +51,11 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= ynh_script_progression --message="Setting up source files..." --time --weight=1 # Download, check integrity, uncompress and patch the source from app.src @@ -73,7 +76,7 @@ ynh_script_progression --message="Building lxd from sources..." --time --weight= pushd ${lxd_tmp} -make deps +ynh_exec_warn_less make deps export CGO_CFLAGS="-I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" export CGO_LDFLAGS="-L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" @@ -83,7 +86,7 @@ cd $GOPATH/src/github.com/lxc/lxd # https://github.com/golang/go/issues/31997#issuecomment-782864390 go env -w GO111MODULE=auto -make +ynh_exec_warn_less make mkdir -p /usr/local/lib/$app mkdir -p /var/log/$app