bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: Fix pkg_swap issues.

Browse Source
This commit is contained in:
Dylan Araps 2020-10-05 09:15:21 +03:00
parent f54432632d
commit 751e7f3456
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiss
View File

@ -969,18 +969,18 @@ pkg_swap() {
# Swap between package alternatives. # Swap between package alternatives.
pkg_list "$1" >/dev/null pkg_list "$1" >/dev/null
# pkg_name + /path/to/file -> pkg_name>path>to>file # pkg_name/path/to/file -> pkg_name>path>to>file
alt=$( alt=$(printf %s "$1$2" | sed 's|/|>|g')
printf %s "$1$2" |
sed 's|/|>|g'
)
cd "$sys_db/../choices" cd "$sys_db/../choices"
if [ ! -f "$alt" ] && [ ! -h "$alt" ]; then if [ -d "$alt" ] || [ -d "$2" ]; then
die "source or target is directory"
elif [ ! -e "$alt" ]; then
die "alternative '$1 $2' doesn't exist" die "alternative '$1 $2' doesn't exist"
elif [ -f "$2" ]; then elif [ -e "$2" ]; then
# Figure out which package owns the file we are going to swap. # Figure out which package owns the file we are going to swap.
pkg_owner -lFx "$2" || pkg_owner -lFx "$2" ||
die "file '$2' exists on filesystem but isn't owned" die "file '$2' exists on filesystem but isn't owned"