toru-utils: trap shows name of $0

2 files changed, 5 insertions, 4 deletions

diff --git a/fullpkg b/fullpkg
index bccd816..9a03b82 100755
--- a/fullpkg
+++ b/fullpkg
@@ -15,6 +15,7 @@ usage() {
     echo " -h           : this message."
     echo ""
     echo "Wrapper for \`fullpkg-find' and \`fullpkg-build'"
+    echo ""
     exit 1
 
 }
diff --git a/toru-utils b/toru-utils
index bb0aef4..7e6d62d 100755
--- a/toru-utils
+++ b/toru-utils
@@ -7,7 +7,7 @@ source /etc/libretools.conf
 
 if [ ! -w "$TORUPATH" ]; then
  error "Toru's path isn't writable. Please check $TORUPATH"
- exit 1 
+ exit 1
 fi
 
 LASTSYNCFILE=${TORUPATH}/lastsync
@@ -81,6 +81,6 @@ trap_exit() {
 
 # Trap signals from makepkg
 set -E
-trap 'trap_exit "(prfullpkg:${level}) TERM signal caught. Exiting..."' TERM HUP QUIT
-trap 'trap_exit "(prfullpkg:${level}) Aborted by user! Exiting..."' INT
-trap 'trap_exit "(prfullpkg:${level}) An unknown error has occurred. Exiting..."' ERR
+trap 'trap_exit "($(basename $0):${level}) TERM signal caught. Exiting..."' TERM HUP QUIT
+trap 'trap_exit "($(basename $0):${level}) Aborted by user! Exiting..."' INT
+trap 'trap_exit "($(basename $0):${level}) An unknown error has occurred. Exiting..."' ERR