X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex;h=0ac5fc3592672214aa6502a2fe855ae45be59b3c;hp=dc67da2af0a8237e458d82aa52746ed5be3ff6a2;hb=d5c2c580d35447207e1e8c0d62c9e55b77ba20d1;hpb=54193a504d8dcf1e2dfae727c76cd1b44884518b

diff --git a/tests/test-imagex b/tests/test-imagex
index dc67da2a..0ac5fc35 100755
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -1,12 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # This script does some sanity testing of the 'imagex' program.  It by no means
 # tests every aspect of wimlib comprehensively.
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
 
 imagex() {
 	echo "imagex $@"
@@ -19,11 +19,10 @@ imagex_info() {
 }
 
 cleanup() {
-	rm -rf dir* tmp* *.wim *.swm
+	fusermount -u tmp &> /dev/null || true
+	rm -rf dir* tmp* *.wim *.swm &> /dev/null || true
 }
-trap cleanup exit
-fusermount -u tmp || true
-rm -rf tmp || true
+cleanup
 
 # Make test directory
 mkdir dir
@@ -78,7 +77,7 @@ for comp_type in None LZX XPRESS; do
 	if ! test "`readlink tmp/subdir/rel_symlink`" = "hello"; then
 		error "Symlink target not correct"
 	fi
-	
+
 	rm -rf dir.wim tmp
 done
 
@@ -489,7 +488,7 @@ fi
 # We try with 5 different combinations of compression types to make sure we go
 # through all paths in the resource-handling code.
 for i in `seq 1 3`; do
-	case $i in 
+	case $i in
 	1)
 		cflag1="--compress=none";
 		cflag2="--compress=none";
@@ -528,3 +527,4 @@ done
 echo "**********************************************************"
 echo "                 Basic imagex tests passed                "
 echo "**********************************************************"
+cleanup