kiss: clean
This commit is contained in:
parent
e97c78ae26
commit
2eaafc78b0
4
kiss
4
kiss
|
@ -814,13 +814,13 @@ pkg_conflicts() {
|
||||||
# conflicting file. (pkg_name>usr>bin>ls)
|
# conflicting file. (pkg_name>usr>bin>ls)
|
||||||
con_name=$(echo "$con" | sed 's|/|>|g')
|
con_name=$(echo "$con" | sed 's|/|>|g')
|
||||||
|
|
||||||
regex_escape "$con" "/$cho_dir/$p_name$con_name"
|
|
||||||
|
|
||||||
# Move the conflicting file to the choices directory
|
# Move the conflicting file to the choices directory
|
||||||
# and name it according to the format above.
|
# and name it according to the format above.
|
||||||
mv -f "$tar_dir/$p_name/$con" \
|
mv -f "$tar_dir/$p_name/$con" \
|
||||||
"$tar_dir/$p_name/$cho_dir/$p_name$con_name"
|
"$tar_dir/$p_name/$cho_dir/$p_name$con_name"
|
||||||
|
|
||||||
|
regex_escape "$con" "/$cho_dir/$p_name$con_name"
|
||||||
|
|
||||||
# Rewrite the package's manifest to update its location
|
# Rewrite the package's manifest to update its location
|
||||||
# to its new spot (and name) in the choices directory.
|
# to its new spot (and name) in the choices directory.
|
||||||
sed -i "s/$sea/$rep/" \
|
sed -i "s/$sea/$rep/" \
|
||||||
|
|
Loading…
Reference in New Issue