From 1a3982bb57ff1d1b108ce4cb3bf16cb7dc9e13fa Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Oct 2014 14:24:42 +0200
Subject: [PATCH] tests: libxbps/shell: fix tests that use ln(1) -r on
 travis-ci.

---
 .../xbps/libxbps/shell/obsoletefiles_test.sh  | 10 +++++-----
 tests/xbps/libxbps/shell/remove_test.sh       | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/xbps/libxbps/shell/obsoletefiles_test.sh b/tests/xbps/libxbps/shell/obsoletefiles_test.sh
index 74b8573f..7f3fad15 100644
--- a/tests/xbps/libxbps/shell/obsoletefiles_test.sh
+++ b/tests/xbps/libxbps/shell/obsoletefiles_test.sh
@@ -61,11 +61,11 @@ root_symlinks_update_body() {
 	mkdir repo
 	mkdir -p pkg_A/usr/bin pkg_A/usr/sbin pkg_A/usr/lib pkg_A/var pkg_A/run
 	touch -f pkg_A/usr/bin/foo
-	ln -sfr pkg_A/usr/bin pkg_A/bin
-	ln -sfr pkg_A/usr/sbin pkg_A/sbin
-	ln -sfr pkg_A/usr/lib pkg_A/usr/lib32
-	ln -sfr pkg_A/usr/lib pkg_A/usr/lib64
-	ln -sfr pkg_A/run pkg_A/var/run
+	ln -sf usr/bin pkg_A/bin
+	ln -sf usr/sbin pkg_A/sbin
+	ln -sf lib pkg_A/usr/lib32
+	ln -sf lib pkg_A/usr/lib64
+	ln -sf ../../run pkg_A/var/run
 
 	cd repo
 	xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
diff --git a/tests/xbps/libxbps/shell/remove_test.sh b/tests/xbps/libxbps/shell/remove_test.sh
index 423e7a10..62ba3f4d 100644
--- a/tests/xbps/libxbps/shell/remove_test.sh
+++ b/tests/xbps/libxbps/shell/remove_test.sh
@@ -9,18 +9,18 @@ keep_base_symlinks_head() {
 
 keep_base_symlinks_body() {
 	mkdir -p root/usr/bin root/usr/lib root/run root/var
-	ln -sfr root/usr/bin root/bin
-	ln -sfr root/usr/lib root/lib
-	ln -sfr root/usr/lib root/usr/lib32
-	ln -sfr root/usr/lib root/usr/lib64
-	ln -sfr root/run root/var/run
+	ln -sf usr/bin root/bin
+	ln -sf usr/lib root/lib
+	ln -sf lib root/usr/lib32
+	ln -sf lib root/usr/lib64
+	ln -sf ../../run root/var/run
 
 	mkdir some_repo
 	mkdir -p pkg_A/usr/bin pkg_A/bin pkg_A/usr/lib pkg_A/var
 	touch -f pkg_A/usr/bin/foo
-	ln -sfr pkg_A/usr/lib pkg_A/usr/lib32
-	ln -sfr pkg_A/usr/lib pkg_A/usr/lib64
-	ln -sfr /run pkg_A/var/run
+	ln -sf lib pkg_A/usr/lib32
+	ln -sf lib pkg_A/usr/lib64
+	ln -sf ../../run pkg_A/var/run
 
 	cd some_repo
 	xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
@@ -51,8 +51,8 @@ remove_symlinks_body() {
 	mkdir some_repo
 	mkdir -p pkg_A/usr/lib pkg_B/usr/lib
 	touch -f pkg_A/usr/lib/libfoo.so.1.2.0
-	ln -sfr pkg_A/usr/lib/libfoo.so.1.2.0 pkg_A/usr/lib/libfoo.so.1
-	ln -sfr pkg_B/usr/lib/libfoo.so.1 pkg_B/usr/lib/libfoo.so
+	ln -sf libfoo.so.1.2.0 pkg_A/usr/lib/libfoo.so.1
+	ln -sf libfoo.so.1 pkg_B/usr/lib/libfoo.so
 
 	cd some_repo
 	xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A