mirror of
https://codeberg.org/kiss-community/kiss
synced 2024-12-25 00:20:05 -07:00
pkg_conflicts: Fix path joining
This commit is contained in:
parent
b9a81e347f
commit
dd3292d920
2
kiss
2
kiss
@ -1066,7 +1066,7 @@ pkg_conflicts() {
|
|||||||
|
|
||||||
# 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" 2>/dev/null || {
|
"$tar_dir/$p_name/$cho_dir/$p_name$con_name" 2>/dev/null || {
|
||||||
log "File must be in ${con%/*} and not a symlink to it"
|
log "File must be in ${con%/*} and not a symlink to it"
|
||||||
log "This usually occurs when a binary is installed to"
|
log "This usually occurs when a binary is installed to"
|
||||||
|
Loading…
Reference in New Issue
Block a user