updated to 6.1

Sync with fedora
This commit is contained in:
Jiri 2022-01-07 18:42:23 +01:00
commit b95081725a
9 changed files with 105 additions and 120 deletions

View file

@ -7,6 +7,15 @@
. /usr/share/java-utils/java-functions
echo $@ | grep -q -e "-verbose"
verbose=$?
function warning() {
if [ $verbose -eq 0 ] ; then
echo ${1} >&2
fi
}
# identify directory tree
JRD=`basename $0`
CONF_HOME=$XDG_CONFIG_HOME
@ -41,7 +50,7 @@ _set_java_home
set_jvm
# all dependencies must be on classpath
set_classpath java-runtime-decompiler byteman google-gson classpathless-compiler
set_classpath java-runtime-decompiler rsyntaxtextarea byteman google-gson classpathless-compiler objectweb-asm
CLASSPATH=$CLASSPATH:${JAVA_HOME}/lib/tools.jar
# set path to agent automatically
@ -58,7 +67,7 @@ for cpfile in $CP_FILES; do
then
cp $cpfile $PLUGIN_HOME
else
echo "Configuration files were not copied for $FILE_NAME - the existing configuration would be overwritten." >&2
warning "Configuration files were not copied for $FILE_NAME - the existing configuration would be overwritten."
fi
done
@ -69,11 +78,11 @@ if [ -e $AGENT ]
then
if grep -Fxq $AGENT_STRING $CONFIG_FILE
then
echo "Default agent path is already set in $CONFIG_FILE. Skipping agent path setting." >&2
warning "Default agent path is already set in $CONFIG_FILE. Skipping agent path setting."
elif grep -rq $AGENT_PREFIX $CONFIG_FILE
then
RESULT_OF_GREP="$(grep -rq $AGENT_PREFIX $CONFIG_FILE)"
echo "Agent path is already set in $CONFIG_FILE as ${RESULT_OF_GREP}. Skipping agent path setting." >&2
warning "Agent path is already set in $CONFIG_FILE as ${RESULT_OF_GREP}. Skipping agent path setting."
else
echo $AGENT_STRING >> $CONFIG_FILE
@ -82,5 +91,5 @@ else
echo "Agent was not found and agent path was not set correctly. This has to be done manually in the decompiler GUI, or set AGENT_PATH===path_to_agent_jar in the configuration file: $CONFIG_FILE" >&2
fi
export FLAGS="$FLAGS -Djdk.attach.allowAttachSelf=true"
export FLAGS="$FLAGS -Djdk.attach.allowAttachSelf=true --add-exports jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED" # jdk11+ do not allow attach by default; jdk17 is hiding javap api
run "$@"