diff --git a/Makefile b/Makefile index 30690d35..a456f62c 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,8 @@ DD = dd conv=notrunc BEG = util/mk-beg END = util/mk-end INFO = util/mk-info -ERRORS = 2>>/tmp/.build-errors || util/mk-error -ERRORSS = >>/tmp/.build-errors || util/mk-error +ERRORS = 2>>/tmp/.`whoami`-build-errors || util/mk-error +ERRORSS = >>/tmp/.`whoami`-build-errors || util/mk-error BEGRM = util/mk-beg-rm ENDRM = util/mk-end-rm diff --git a/util/install-toolchain.sh b/util/install-toolchain.sh index f4c75d1f..2ab6ce7d 100755 --- a/util/install-toolchain.sh +++ b/util/install-toolchain.sh @@ -18,6 +18,7 @@ if [[ "$PROMPT" = "y" ]] ; then wget "http://dl.dropbox.com/u/44305966/toaru-toolchain-0.0.1.tar.gz" popd tar -x -C util/ -f "/tmp/toaru-toolchain-0.0.1.tar.gz" + rm "/tmp/toaru-toolchain-0.0.1.tar.gz" echo "Done!" echo "You should now add \033[1;33m`pwd`/util/toaru-toolchain/bin\033[0m to your path" else diff --git a/util/mk-beg b/util/mk-beg index 2389d5ef..d45e0592 100755 --- a/util/mk-beg +++ b/util/mk-beg @@ -1,7 +1,7 @@ #!/bin/bash . util/cpad.sh -echo -n > /tmp/.build-errors +echo -n > /tmp/.`whoami`-build-errors CMD=`cpad "$1" 8 " "` echo -e -n "\033[32m${CMD}${2}\033[0m\n" diff --git a/util/mk-beg-rm b/util/mk-beg-rm index 7c975974..399a74f4 100755 --- a/util/mk-beg-rm +++ b/util/mk-beg-rm @@ -1,7 +1,7 @@ #!/bin/bash . util/cpad.sh -echo -n > /tmp/.build-errors +echo -n > /tmp/.`whoami`-build-errors CMD=`cpad "$1" 8 " "` echo -e -n "\033[31m${CMD}${2}\033[0m\n" diff --git a/util/mk-end b/util/mk-end index e0dd2e85..e599bf0a 100755 --- a/util/mk-end +++ b/util/mk-end @@ -2,8 +2,8 @@ . util/cpad.sh CMD=`cpad "$1" 8 " "` -if [[ -s /tmp/.build-errors ]] ; then - cat /tmp/.build-errors +if [[ -s /tmp/.`whoami`-build-errors ]] ; then + cat /tmp/.`whoami`-build-errors echo -e -n "\r\033[1;33m${CMD}${2}\033[0m\n" else echo -e -n "\r\033[A\033[1;32m${CMD}${2}\033[0m\033[K\n" diff --git a/util/mk-error b/util/mk-error index ef74d038..76fcc5da 100755 --- a/util/mk-error +++ b/util/mk-error @@ -1,6 +1,6 @@ #!/bin/bash echo -e "\033[1;31m! Fatal error encountered.\033[0m" -cat /tmp/.build-errors +cat /tmp/.`whoami`-build-errors exit 1