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

[fix] ynh_write_var_in_file should replace one occurencies

Browse source
This commit is contained in:
ljf 2023-02-06 15:44:50 +01:00
parent 387f57d630
commit ca0db0ec58
No known key found for this signature in database
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
helpers/utils
View file

@ -614,15 +614,14 @@ ynh_write_var_in_file() {
set +o xtrace # set +x set +o xtrace # set +x
# Get the line number after which we search for the variable # Get the line number after which we search for the variable
local line_number=1 local after_line_number=1
if [[ -n "$after" ]]; then if [[ -n "$after" ]]; then
line_number=$(grep -m1 -n $after $file | cut -d: -f1) after_line_number=$(grep -m1 -n $after $file | cut -d: -f1)
if [[ -z "$line_number" ]]; then if [[ -z "$after_line_number" ]]; then
set -o xtrace # set -x set -o xtrace # set -x
return 1 return 1
fi fi
fi fi
local range="${line_number},\$ "
local filename="$(basename -- "$file")" local filename="$(basename -- "$file")"
local ext="${filename##*.}" local ext="${filename##*.}"
@ -647,11 +646,14 @@ ynh_write_var_in_file() {
var_part+='\s*' var_part+='\s*'
# Extract the part after assignation sign # Extract the part after assignation sign
local expression_with_comment="$((tail +$line_number ${file} | grep -i -o -P $var_part'\K.*$' || echo YNH_NULL) | head -n1)" local expression_with_comment="$((tail +$after_line_number ${file} | grep -i -o -P $var_part'\K.*$' || echo YNH_NULL) | head -n1)"
if [[ "$expression_with_comment" == "YNH_NULL" ]]; then if [[ "$expression_with_comment" == "YNH_NULL" ]]; then
set -o xtrace # set -x set -o xtrace # set -x
return 1 return 1
fi fi
local value_line_number="$(tail +$after_line_number ${file} | grep -m1 -n -i -P $var_part'\K.*$' | cut -d: -f1)"
value_line_number=$((after_line_number + value_line_number))
local range="${after_line_number},${value_line_number} "
# Remove comments if needed # Remove comments if needed
local expression="$(echo "$expression_with_comment" | sed "s@${comments}[^$string]*\$@@g" | sed "s@\s*[$endline]*\s*]*\$@@")" local expression="$(echo "$expression_with_comment" | sed "s@${comments}[^$string]*\$@@g" | sed "s@\s*[$endline]*\s*]*\$@@")"