Update JarTighten, mark Jar files as executable

NeRdTheNed · Oct 17, 2023 · 0d7e2b6 · 0d7e2b6
1 parent 222faf5
commit 0d7e2b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ci-tools/JarTighten-1.2.10-all.jar → ci-tools/JarTighten-1.2.11-all.jar b/ci-tools/JarTighten-1.2.10-all.jar → ci-tools/JarTighten-1.2.11-all.jar
diff --git a/removeDirectoryEntries.sh b/removeDirectoryEntries.sh
@@ -37,9 +37,9 @@ do
       fi
     fi
     if [[ "$BUILD_RELEASE" == "true" ]]; then
-      java -jar ./ci-tools/JarTighten-1.2.10-all.jar -o -c -E -S -t -z -j --mode=MULTI_CHEAP "$jarJar" "$jarJar"
+      java -jar ./ci-tools/JarTighten-1.2.11-all.jar -x -o -c -E -S -t -z -j --mode=MULTI_CHEAP "$jarJar" "$jarJar"
     else
-      java -jar ./ci-tools/JarTighten-1.2.10-all.jar -o -c -E -S -t --mode=MULTI_CHEAP "$jarJar" "$jarJar"
+      java -jar ./ci-tools/JarTighten-1.2.11-all.jar -x -o -c -E -S -t --mode=MULTI_CHEAP "$jarJar" "$jarJar"
     fi
   done
   echo "test $file"
@@ -87,9 +87,14 @@ do
       ./ci-tools/ect-0.9.4-mac -90032 --disable-png --disable-jpg -strip -zip "$file"
     fi
   fi
+  if [[ $file == *.jar ]]; then
+      extra_args="-x"
+  else
+      extra_args=""
+  fi
   if [[ "$BUILD_RELEASE" == "true" ]]; then
-    java -jar ./ci-tools/JarTighten-1.2.10-all.jar -o -c -E -S -t -z -j --mode=MULTI_CHEAP "$file" "$file"
+    java -jar ./ci-tools/JarTighten-1.2.11-all.jar $extra_args -o -c -E -S -t -z -j --mode=MULTI_CHEAP "$file" "$file"
   else
-    java -jar ./ci-tools/JarTighten-1.2.10-all.jar -o -c -E -S -t --mode=MULTI_CHEAP "$file" "$file"
+    java -jar ./ci-tools/JarTighten-1.2.11-all.jar $extra_args -o -c -E -S -t --mode=MULTI_CHEAP "$file" "$file"
   fi
 done