Skip to content

Commit 9cf3a5a

Browse files
authored
Merge pull request #477 from dscho/pacman-quick-add-vs-winsymlinks
pacman-helper quick_add: do handle symbolic links
2 parents 29b182b + a8ece7a commit 9cf3a5a

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

pacman-helper.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,13 +677,23 @@ quick_add () { # <file>...
677677
done
678678
(cd "$dir/$arch" &&
679679
repo_add $sign_option git-for-windows.db.tar.xz $msys $mingw &&
680-
cp git-for-windows.db.tar.xz git-for-windows.db &&
681-
{ test -z "$sign_option" || cp git-for-windows.db.tar.xz.sig git-for-windows.db.sig; } &&
680+
{ test ! -h git-for-windows.db || rm git-for-windows.db; } &&
681+
cp git-for-windows.db.tar.xz git-for-windows.db && {
682+
test -z "$sign_option" || {
683+
{ test ! -h git-for-windows.db.sig || rm git-for-windows.db.sig; } &&
684+
cp git-for-windows.db.tar.xz.sig git-for-windows.db.sig
685+
}
686+
} &&
682687
if test -n "$db2"
683688
then
684689
repo_add $sign_option git-for-windows-$db2.db.tar.xz $mingw &&
685-
cp git-for-windows-$db2.db.tar.xz git-for-windows-$db2.db &&
686-
{ test -z "$sign_option" || cp git-for-windows-$db2.db.tar.xz.sig git-for-windows-$db2.db.sig; }
690+
{ test ! -h git-for-windows-$db2.db || rm git-for-windows-$db2.db; } &&
691+
cp git-for-windows-$db2.db.tar.xz git-for-windows-$db2.db && {
692+
test -z "$sign_option" || {
693+
{ test ! -h git-for-windows-$db2.db.sig || rm git-for-windows-$db2.db.sig; } &&
694+
cp git-for-windows-$db2.db.tar.xz.sig git-for-windows-$db2.db.sig
695+
}
696+
}
687697
fi) ||
688698
die "Could not add $msys $mingw to db in $arch"
689699
done

0 commit comments

Comments
 (0)