core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug in needs redecomp deleting wrong directory

This commit is contained in:
Aikar 2018-08-31 23:59:03 -04:00
parent 62153085aa
commit 78dc176e5c
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/decompile.sh
View File

@ -21,7 +21,11 @@ forgeflowercachefile="$decompiledir/forgeflowercache"
forgeflowercachevalue="$forgeflowerurl - $forgeflowerversion - $forgefloweroptions"; forgeflowercachevalue="$forgeflowerurl - $forgeflowerversion - $forgefloweroptions";
classdir="$decompiledir/classes" classdir="$decompiledir/classes"
# prep folders
mkdir -p "$workdir/ForgeFlower" mkdir -p "$workdir/ForgeFlower"
mkdir -p "$spigotdecompiledir"
mkdir -p "$forgedecompiledir"
echo "Extracting NMS classes..." echo "Extracting NMS classes..."
if [ ! -d "$classdir" ]; then if [ ! -d "$classdir" ]; then
@ -37,10 +41,6 @@ if [ ! -d "$classdir" ]; then
set -e set -e
fi fi
# prep folders
mkdir -p "$spigotdecompiledir"
mkdir -p "$forgedecompiledir"
needsDecomp=0 needsDecomp=0
if [ ! -f "$forgeflowercachefile" ]; then if [ ! -f "$forgeflowercachefile" ]; then
needsDecomp=1 needsDecomp=1
@ -49,7 +49,7 @@ elif [ "$(cat ${forgeflowercachefile})" != "$forgeflowercachevalue" ]; then
fi fi
if [ "$needsDecomp" == "1" ]; then if [ "$needsDecomp" == "1" ]; then
# our local cache is now invalidated, we can update forgeflower to get better deobfuscation # our local cache is now invalidated, we can update forgeflower to get better deobfuscation
rm -rf "$forgedecompiledir" rm -rf "$forgedecompiledir/net"
fi fi
# Forge (for Paper mc-dev imports, and dev src folders for unimported files) # Forge (for Paper mc-dev imports, and dev src folders for unimported files)