From 2a6b802bb013bcda953a9330ca63187f5f27c4b7 Mon Sep 17 00:00:00 2001 From: Marc BARBIER Date: Tue, 6 Jul 2021 16:33:09 +0200 Subject: [PATCH] better clean --- makefile | 9 +++++++++ scripts/clean.sh | 12 ++++++++++-- scripts/fatPackage.sh | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 scripts/fatPackage.sh diff --git a/makefile b/makefile index 62553ac..c75a173 100644 --- a/makefile +++ b/makefile @@ -1,3 +1,12 @@ ALL: + scripts/clean.sh; scripts/build.sh; scripts/package.sh; + +FAT: + scripts/clean.sh; + scripts/build.sh; + scripts/fatPackage.sh; + +CLEAN: + scripts/clean.sh; diff --git a/scripts/clean.sh b/scripts/clean.sh index d906a33..f8f0951 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -1,3 +1,11 @@ #!/bin/sh -rm objs/* -r -rm mcDownloader.jar +ls objs/* > /dev/null 2> /dev/null + +HASOBJS=$? +if [ $HASOBJS -eq 0 ]; then + rm objs/* -r +fi + +if test -f "mcDownloader.jar"; then + rm mcDownloader.jar +fi diff --git a/scripts/fatPackage.sh b/scripts/fatPackage.sh new file mode 100755 index 0000000..ae05c67 --- /dev/null +++ b/scripts/fatPackage.sh @@ -0,0 +1,16 @@ +if test -f "mcDownloader.jar"; then + rm mcDownloader.jar +fi + +pwd +LIBS=$( cd objs/ && ls ../libs/*.jar) +echo $LIBS +cd objs + +for lib in ${LIBS}; do + jar -xf $lib +done + +rm META-INF -r + +jar cfm ../mcDownloader.jar ../MANIFEST.MF *