diff options
| author | Sebastian Nowicki <sebnow@gmail.com> | 2008-05-21 01:51:38 +0800 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-05-29 06:37:13 -0500 |
| commit | 1d71079c5b57af2feb53fbfa98f93122a32ca154 (patch) | |
| tree | d76d6f9a2a8b0e03ac0edd3296436e2272dc8b4f | |
| parent | bf2964dc5841f49d1d5ab60181b0caa4670c1874 (diff) | |
Replace usage of "cp -s" with the more portable "ln -s"
The "-s" argument does not exist on BSD, and neither does
"--remove-destination". This patch replaces the calls to "cp -s
--remove-destination" with the equivalent "rm -f" and "ln -s" calls, in
order to increase portability.
Signed-off-by: Sebastian Nowicki <sebnow@gmail.com>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68d..273bc0ab 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -435,11 +435,13 @@ download_sources() { local file=$(strip_url "$netfile") if [ -f "$startdir/$file" ]; then msg2 "$(gettext "Found %s in build dir")" "$file" - cp -s --remove-destination "$startdir/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$startdir/$file" "$srcdir/" continue elif [ -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Using cached copy of %s")" "$file" - cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$SRCDEST/$file" "$srcdir/" continue fi @@ -464,7 +466,8 @@ download_sources() { if echo "$dlclient" | grep -q "%o" ; then mv -f "$SRCDEST/$file.part" "$SRCDEST/$file" fi - cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$SRCDEST/$file" "$srcdir/" done popd &>/dev/null |