X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fmodulify-jar.sh;h=f508ed2bee769ad7da8e60193eedb81789eade64;hb=567b80e2766af7104b626e8c01696cb76414d063;hp=65ca36fd5e8cbee6885e7ccc78d615d6abefc587;hpb=382f5ff058a4c2fed1e9874bb712b40f16ec1a4e;p=jalview.git diff --git a/utils/modulify-jar.sh b/utils/modulify-jar.sh index 65ca36f..f508ed2 100755 --- a/utils/modulify-jar.sh +++ b/utils/modulify-jar.sh @@ -27,6 +27,11 @@ FILENAME=$(basename $JARFILE) BASE=$(basename -s $EXT $JARFILE) DIR=$(dirname $JARFILE) +# set absolute path to $JARFILE if not specified +[ x${DIR#/} = x$DIR ] && DIR=$(cd "$DIR" && pwd) + +ABSJARFILE=$DIR/$FILENAME + TMPDIR=/tmp/$USER-$CMD-$BASE-$$ [ x$FILENAME = x$BASE ] && error "Should be $EXT file" @@ -34,8 +39,8 @@ TMPDIR=/tmp/$USER-$CMD-$BASE-$$ mkdir -p $TMPDIR/jar || error "Could not create tmp dir $TMPDIR/jar" mkdir -p $TMPDIR/info || error "Could not create tmp dir $TMPDIR/info" cd $TMPDIR/jar -jar -xvf $JARFILE > /dev/null -jdeps --generate-module-info $TMPDIR/info $JARFILE +jar -xvf $ABSJARFILE > /dev/null +jdeps --module-path="$DIR" --generate-module-info $TMPDIR/info $ABSJARFILE # next line assuming only one module-info.java file created, I think this is always true...? It'll just use the last one if not. find $TMPDIR/info -name "module-info.java" -exec /bin/mv {} . \; [ -e ./module-info.java ] || error "No module-info.java file found in $TMPDIR/info"