From 0c5f79a603da7027c8a91b6694e6d46ffc2ef3f8 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 8 Sep 2015 23:47:45 +0200
Subject: [PATCH] Fix sys/user.sh

---
 Makefile    | 1 +
 sys/user.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b862149dac..d1b0d73c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,7 @@ user-install:
 
 user-uninstall:
 	$(foreach mod,$(R2BINS),rm -f ~/bin/$(mod))
+	rm -f ~/bin/r2
 	-rmdir ~/bin
 
 purge-dev:
diff --git a/sys/user.sh b/sys/user.sh
index 8441573fe8..9aad2212f7 100755
--- a/sys/user.sh
+++ b/sys/user.sh
@@ -30,14 +30,18 @@ if [ ! -d "${HOME}" ]; then
 	exit 1
 fi
 
-ROOT="${HOME}/.radare2-prefix"
-mkdir -p "${ROOT}"
+ROOT="${HOME}/bin/prefix/radare2/"
+mkdir -p "${ROOT}/lib"
 
 if [ "${HARDEN}" = 1 ]; then
 	./sys/build-harden.sh "${ROOT}" && ${MAKE} symstall
 else
 	./sys/build.sh "${ROOT}" && ${MAKE} symstall
 fi
+if [ $? != 0 ]; then
+	echo "Oops"
+	exit 1
+fi
 ${MAKE} user-install
 echo
 echo radare2 is now installed in ~/.radare2-prefix