1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/gitlab_ynh.git synced 2024-09-03 18:36:35 +02:00
This commit is contained in:
kay0u 2019-07-31 10:25:20 +02:00
parent 49b1b4734f
commit 96d370c9ca
3 changed files with 12 additions and 24 deletions

View file

@ -181,14 +181,10 @@ tempdir="$(mktemp -d)"
ynh_setup_source --dest_dir=$tempdir --source_id=$architecture ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ; then # This command will fail in lxc env
then # This command will fail in lxc env package_check_action # defined in upgrade.d/upgrade.last.sh
package_check_action # defined in upgrade.d/upgrade.last.sh ynh_exec_warn_less dpkg --configure gitlab-ce
ynh_exec_warn_less dpkg --configure gitlab-ce
fi
else
ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename
fi fi
#================================================= #=================================================

View file

@ -115,14 +115,10 @@ tempdir="$(mktemp -d)"
ynh_setup_source --dest_dir=$tempdir --source_id=$architecture ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ; then # This command will fail in lxc env
then # This command will fail in lxc env package_check_action # defined in upgrade.d/upgrade.last.sh
package_check_action # defined in upgrade.d/upgrade.last.sh ynh_exec_warn_less dpkg --configure gitlab-ce
ynh_exec_warn_less dpkg --configure gitlab-ce
fi
else
ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename
fi fi
#================================================= #=================================================

View file

@ -275,14 +275,10 @@ then
ynh_setup_source --dest_dir=$tempdir --source_id=$architecture ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ; then # This command will fail in lxc env
then # This command will fail in lxc env package_check_action # defined in upgrade.d/upgrade.X.sh
package_check_action # defined in upgrade.d/upgrade.X.sh ynh_exec_warn_less dpkg --configure gitlab-ce
ynh_exec_warn_less dpkg --configure gitlab-ce
fi
else
ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename
fi fi
ynh_exec_warn_less ynh_secure_remove --file="$tempdir" ynh_exec_warn_less ynh_secure_remove --file="$tempdir"