http://bugzilla.novell.com/show_bug.cgi?id=596177 http://bugzilla.novell.com/show_bug.cgi?id=596177#c11 --- Comment #11 from Michal Vyskocil <mvyskocil@novell.com> 2010-05-21 09:21:17 UTC --- (In reply to comment #10)
It's ok except for the openssl-certs provides. That's intentionally provided by ca-certificates-mozilla instead as ca-certificates itself doesn't contain any certificates.
OK
Also, that ls -1 stuff looks weird. What about hardcoding /usr/bin/{java,gij} instead?
Yes, it looks. Well, for /usr/bin/java we will need to check if it is not a gcj. So the diff against your current version looks like: --- ../../java.run 2010-05-19 12:03:53.000000000 +0200 +++ java.run 2010-05-21 11:18:38.864872316 +0200 @@ -38,7 +38,11 @@ java=`which java` fi -if [ ! -e "$libexecdir"/keystore.jar -a ! -x "$libexecdir"/keystore ]; then +if [[ $(readlink -f "${java}") =~ gij ]]; then + java="" +fi + +if [ ! -e "$libexecdir"/keystore.jar ]; then # nothing to do exit 0 fi @@ -50,9 +54,6 @@ if [ -e "$libexecdir"/keystore.jar -a "$cadir" -nt "$cafile" ]; then mustrun=1 fi -if [ -e "$libexecdir"/keystore -a "$cadir" -nt "$cafile_gcj" ]; then - mustrun=1 -fi [ -n "$mustrun" ] || exit 0 @@ -76,9 +77,9 @@ echo "creating $cafile ..." $java -jar $libexecdir/keystore.jar -keystore "$cafile" -cadir "$cadir" "$@" fi -if [ -x "$libexecdir"/keystore ]; then +if [ -x "/usr/bin/gij" ]; then echo "creating $cafile_gcj ..." - $libexecdir/keystore -keystore "$cafile_gcj" -cadir "$cadir" "$@" + /usr/bin/gij -jar $libexecdir/keystore.jar -keystore "$cafile_gcj" -cadir "$cadir" "$@" fi # vim: syntax=sh We normally try to fill $java, but then I'll test if it is not a gij, if so, variable is removed. Then gcj part is triggered by existence of executable /usr/bin/gij -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.