mirror of
https://github.com/YunoHost-Apps/nomad_ynh.git
synced 2024-09-03 19:55:53 +02:00
Merge branch 'testing' into improving
This commit is contained in:
commit
46be701296
3 changed files with 4 additions and 3 deletions
2
scripts/install
Executable file → Normal file
2
scripts/install
Executable file → Normal file
|
@ -108,7 +108,7 @@ then
|
||||||
if [ $driver_lxc -eq 1 ]
|
if [ $driver_lxc -eq 1 ]
|
||||||
then
|
then
|
||||||
$client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
|
$client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
|
||||||
ynh_install_go --go_version=$go_version
|
ynh_exec_warn_less ynh_install_go --go_version=$go_version
|
||||||
fi
|
fi
|
||||||
ynh_install_app_dependencies $client_pkg_dependencies
|
ynh_install_app_dependencies $client_pkg_dependencies
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
source _common.sh
|
source _common.sh
|
||||||
|
source ynh_install_go
|
||||||
source /usr/share/yunohost/helpers
|
source /usr/share/yunohost/helpers
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -96,7 +96,7 @@ then
|
||||||
if [ $driver_lxc -eq 1 ]
|
if [ $driver_lxc -eq 1 ]
|
||||||
then
|
then
|
||||||
$client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
|
$client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
|
||||||
ynh_install_go --go_version=$go_version
|
ynh_exec_warn_less ynh_install_go --go_version=$go_version
|
||||||
fi
|
fi
|
||||||
ynh_install_app_dependencies $client_pkg_dependencies
|
ynh_install_app_dependencies $client_pkg_dependencies
|
||||||
fi
|
fi
|
||||||
|
@ -130,7 +130,7 @@ then
|
||||||
ynh_use_go
|
ynh_use_go
|
||||||
export GOPATH="$tempdir/go"
|
export GOPATH="$tempdir/go"
|
||||||
export GOCACHE="$tempdir/.cache"
|
export GOCACHE="$tempdir/.cache"
|
||||||
ynh_exec_warn_less$ynh_go build
|
ynh_exec_warn_less $ynh_go build
|
||||||
popd
|
popd
|
||||||
|
|
||||||
mv -f $tempdir/nomad-driver-lxc $datadir/plugins/nomad-driver-lxc
|
mv -f $tempdir/nomad-driver-lxc $datadir/plugins/nomad-driver-lxc
|
||||||
|
|
Loading…
Add table
Reference in a new issue