mirror of
https://github.com/YunoHost-Apps/gitlab_ynh.git
synced 2024-09-03 18:36:35 +02:00
Fix PACKAGE_CHECK_EXEC
This commit is contained in:
parent
cd0f3902ff
commit
920fc39729
3 changed files with 12 additions and 12 deletions
|
@ -181,7 +181,7 @@ 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 0 ]; then
|
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
|
||||||
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||||
|
|
|
@ -113,7 +113,7 @@ 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 0 ]; then
|
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
|
||||||
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||||
|
|
|
@ -250,7 +250,7 @@ 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 0 ]; then
|
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
|
||||||
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||||
|
|
Loading…
Add table
Reference in a new issue