From 57eb15a658df61ba494581386b45ddcbc70acc30 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 14:35:52 +0000 Subject: [PATCH 01/10] Create package system for Java projects Co-authored-by: sigonasr2 --- Java/scripts/filelist | 1 + Java/scripts/md5 | 1 + Java/scripts/release.sh | 15 +++++++++++++++ Java/scripts/version_info | 3 ++- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Java/scripts/release.sh diff --git a/Java/scripts/filelist b/Java/scripts/filelist index a83fc3d..455d98e 100644 --- a/Java/scripts/filelist +++ b/Java/scripts/filelist @@ -2,5 +2,6 @@ build.sh clean.sh commit.sh jar.sh +release.sh update.sh version_info diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 175771d..372292f 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -2,4 +2,5 @@ build.sh:22308eae5fd9c88aa16fef54cf03ae21 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar.sh:99c7520b5eb08be888ce3c91784e5462 - +release.sh:bdd5b275fc902cff0eb53db032f976f3 - update.sh:3be721658983183efa395984acd96b03 - diff --git a/Java/scripts/release.sh b/Java/scripts/release.sh new file mode 100644 index 0000000..7358e3c --- /dev/null +++ b/Java/scripts/release.sh @@ -0,0 +1,15 @@ +#Creates a zip file containing all project contents. +#Java +source ${LANGUAGE}/scripts/version_info +TARGET_FILE="$PROJECT_NAME_$RELEASE_VERSION.zip" +rm $TARGET_FILE +FILES=$(cat ${LANGUAGE}/scripts/.package.files) +echo "Creating Package $TARGET_FILE..." +for f in $FILES +do + zip -ur TARGET_FILE $f +done +echo "Complete!" +echo "" +echo "" +echo "" \ No newline at end of file diff --git a/Java/scripts/version_info b/Java/scripts/version_info index 7c8f21c..719f74f 100644 --- a/Java/scripts/version_info +++ b/Java/scripts/version_info @@ -1,2 +1,3 @@ export SOURCE_VERSION="8" -export TARGET_VERSION="8" \ No newline at end of file +export TARGET_VERSION="8" +export RELEASE_VERSION="0.0a" \ No newline at end of file From b3ca6e5b8a859f33eac6c8fde9a16ea9333bbae1 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 14:39:04 +0000 Subject: [PATCH 02/10] Correct variable names not captured correctly. Co-authored-by: sigonasr2 --- Java/scripts/md5 | 2 +- Java/scripts/release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 372292f..0641c62 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -2,5 +2,5 @@ build.sh:22308eae5fd9c88aa16fef54cf03ae21 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar.sh:99c7520b5eb08be888ce3c91784e5462 - -release.sh:bdd5b275fc902cff0eb53db032f976f3 - +release.sh:187af8b146e0039320ddb5dc216015f0 - update.sh:3be721658983183efa395984acd96b03 - diff --git a/Java/scripts/release.sh b/Java/scripts/release.sh index 7358e3c..0f4dfc0 100644 --- a/Java/scripts/release.sh +++ b/Java/scripts/release.sh @@ -1,7 +1,7 @@ #Creates a zip file containing all project contents. #Java source ${LANGUAGE}/scripts/version_info -TARGET_FILE="$PROJECT_NAME_$RELEASE_VERSION.zip" +TARGET_FILE="${PROJECT_NAME}_${RELEASE_VERSION}.zip" rm $TARGET_FILE FILES=$(cat ${LANGUAGE}/scripts/.package.files) echo "Creating Package $TARGET_FILE..." From 3b052dbba3c1a4aa179f2397a0376bc14d147abf Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 14:43:12 +0000 Subject: [PATCH 03/10] Forgot to parse TARGET_FILE variable Co-authored-by: sigonasr2 --- Java/scripts/md5 | 2 +- Java/scripts/release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 0641c62..cd2f5db 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -2,5 +2,5 @@ build.sh:22308eae5fd9c88aa16fef54cf03ae21 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar.sh:99c7520b5eb08be888ce3c91784e5462 - -release.sh:187af8b146e0039320ddb5dc216015f0 - +release.sh:556de665c917b7fc2af67c6c05d07bbc - update.sh:3be721658983183efa395984acd96b03 - diff --git a/Java/scripts/release.sh b/Java/scripts/release.sh index 0f4dfc0..c7accd0 100644 --- a/Java/scripts/release.sh +++ b/Java/scripts/release.sh @@ -7,7 +7,7 @@ FILES=$(cat ${LANGUAGE}/scripts/.package.files) echo "Creating Package $TARGET_FILE..." for f in $FILES do - zip -ur TARGET_FILE $f + zip -ur $TARGET_FILE $f done echo "Complete!" echo "" From 7a1e2e8e84ed5ee3e1b873eea0eaf6799ec29f7b Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 14:46:53 +0000 Subject: [PATCH 04/10] clean needs to be run inside of bin but needs to access the correct script Co-authored-by: sigonasr2 --- Java/scripts/jar.sh | 2 +- Java/scripts/md5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Java/scripts/jar.sh b/Java/scripts/jar.sh index 266d500..d201c59 100755 --- a/Java/scripts/jar.sh +++ b/Java/scripts/jar.sh @@ -13,5 +13,5 @@ jar cfm ${PROJECT_NAME}.jar ${ORIGINAL_LOC}/manifest sig jar uf ${PROJECT_NAME}.jar -C ../lib/bin/ . printf "\n\n\nRunning Program...\n\n" java -cp .:../lib/bin -Djava.library.path="${LIBRARY_PATH}" -jar ${PROJECT_NAME}.jar "$@" -./${LANGUAGE}/scripts/clean.sh +../${LANGUAGE}/scripts/clean.sh cd .. diff --git a/Java/scripts/md5 b/Java/scripts/md5 index cd2f5db..13daf67 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,6 +1,6 @@ build.sh:22308eae5fd9c88aa16fef54cf03ae21 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - -jar.sh:99c7520b5eb08be888ce3c91784e5462 - +jar.sh:343cf505530401fb696296bc25a9b090 - release.sh:556de665c917b7fc2af67c6c05d07bbc - update.sh:3be721658983183efa395984acd96b03 - From a4eabd48a12f3c07c5af236b755f214cc4370b84 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 14:47:50 +0000 Subject: [PATCH 05/10] Remove rm command Co-authored-by: sigonasr2 --- Java/scripts/md5 | 2 +- Java/scripts/release.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 13daf67..6ae0752 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -2,5 +2,5 @@ build.sh:22308eae5fd9c88aa16fef54cf03ae21 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar.sh:343cf505530401fb696296bc25a9b090 - -release.sh:556de665c917b7fc2af67c6c05d07bbc - +release.sh:b1b62203411b18d0fec1db3dc2e5a061 - update.sh:3be721658983183efa395984acd96b03 - diff --git a/Java/scripts/release.sh b/Java/scripts/release.sh index c7accd0..0f7389c 100644 --- a/Java/scripts/release.sh +++ b/Java/scripts/release.sh @@ -2,7 +2,6 @@ #Java source ${LANGUAGE}/scripts/version_info TARGET_FILE="${PROJECT_NAME}_${RELEASE_VERSION}.zip" -rm $TARGET_FILE FILES=$(cat ${LANGUAGE}/scripts/.package.files) echo "Creating Package $TARGET_FILE..." for f in $FILES From c8559996ca041f9f244d3428a24b8d8ab2300798 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 15:47:21 +0000 Subject: [PATCH 06/10] Only script files should get displayed in the command list. Co-authored-by: sigonasr2 --- utils/main.sh | 2 +- utils/md5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/main.sh b/utils/main.sh index 62ec20d..d299d6b 100644 --- a/utils/main.sh +++ b/utils/main.sh @@ -16,7 +16,7 @@ if [ -z "$1" ] FILES=$(ls -1A ./$LANGUAGE/scripts 2>/dev/null | sed -e 's/\.sh$//' | sed -e 's/^/ /') for f in $FILES do - if [ $f != "md5" ] && [ $f != "version_info" ] && [ $f != "filelist" ]; then + if [ -f "./$LANGUAGE/scripts/$f.sh" ]; then DESC="$(head -n1 ./$LANGUAGE/scripts/$f.sh)" printf "\n\t%-15s%-65s" $f "${DESC:1}" fi diff --git a/utils/md5 b/utils/md5 index 2f738cd..f71f6ee 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ define.sh:cf246587e7509edd9283cb8e8e4b26cf - -main.sh:afdc55cbdd992bf2a7e21ed79a773d8f - +main.sh:d3d1bd0b56d8114eb7479964227f8576 - search.sh:248d94cca6eeb92c384e9c49c9d0f4a9 - .updateDirectories:0ede00461e947494545e694040787b3f - From 88b8f411a5a28599aae0a4ba3e189904d1c596af Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 15:53:13 +0000 Subject: [PATCH 07/10] prevent .package.files from being part of md5 Co-authored-by: sigonasr2 --- utils/md5 | 2 +- utils/search.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/md5 b/utils/md5 index f71f6ee..62ddffd 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ define.sh:cf246587e7509edd9283cb8e8e4b26cf - main.sh:d3d1bd0b56d8114eb7479964227f8576 - -search.sh:248d94cca6eeb92c384e9c49c9d0f4a9 - +search.sh:722ebea1642286235eb6ac18351b3408 - .updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index 7342b97..b4eab50 100644 --- a/utils/search.sh +++ b/utils/search.sh @@ -8,7 +8,7 @@ function search() { search $1$g/ else echo "$1$g is a file" - if [ $g != "md5" ] && [ $g != "filelist" ]; then + if [ $g != "md5" ] && [ $g != "filelist" ] && [ $g != ".package.files" ]; then if [ $g != ".coauthors" ] && [ $g != "version_info" ]; then SUM=$(md5sum < $1$g) echo "$g:$SUM" >> $1md5 From c5dbc62a5ef07c409013e17522b2425f11b26f71 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 6 Jun 2022 15:54:27 +0000 Subject: [PATCH 08/10] prevent .package.files from being part of checks Co-authored-by: sigonasr2 --- utils/md5 | 2 +- utils/search.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/md5 b/utils/md5 index 62ddffd..a258318 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ define.sh:cf246587e7509edd9283cb8e8e4b26cf - main.sh:d3d1bd0b56d8114eb7479964227f8576 - -search.sh:722ebea1642286235eb6ac18351b3408 - +search.sh:81d08f5ff48e8a44b5f68387d426da05 - .updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index b4eab50..99a69b3 100644 --- a/utils/search.sh +++ b/utils/search.sh @@ -38,7 +38,7 @@ function check() { IFS=':' read -ra split <<< $line g="${split[0]}" echo "LINE -- $g" - if [ "$g" != "md5" ] && [ "$g" != "filelist" ]; then + if [ "$g" != "md5" ] && [ "$g" != "filelist" ] && [ "$g" != ".package.files" ]; then if [ -f $1$g ]; then if [ "$g" != ".coauthors" ] && [ "$g" != "version_info" ]; then @@ -72,7 +72,7 @@ function check() { IFS=':' read -ra split <<< $line g="${split[0]}" echo "LINE -- $g" - if [ "$g" != "md5" ] && [ "$g" != "filelist" ]; then + if [ "$g" != "md5" ] && [ "$g" != "filelist" ] && [ "$g" != ".package.files" ]; then if [ -f $1$g ]; then if [ "$g" != ".coauthors" ] && [ "$g" != "version_info" ]; then From abc3c9676cb7fcf1998e9f3a8b5938c56be575af Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Tue, 7 Jun 2022 18:36:31 +0000 Subject: [PATCH 09/10] If the second argument is update there will be no updating. Co-authored-by: sigonasr2 --- utils/define.sh | 2 +- utils/md5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/define.sh b/utils/define.sh index 1dc7f41..214fc50 100755 --- a/utils/define.sh +++ b/utils/define.sh @@ -8,7 +8,7 @@ function define() { eval export "$1"='$value' } -if [[ $(pwd) != *"SigScript" && $AUTO_UPDATE = "true" ]]; then +if [[ $(pwd) != *"SigScript" && $AUTO_UPDATE = "true" && $1 != "update" ]]; then source utils/search.sh find . -type f -name md5 -delete diff --git a/utils/md5 b/utils/md5 index a258318..baa339d 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ -define.sh:cf246587e7509edd9283cb8e8e4b26cf - +define.sh:3ecab0dffe2adfb950f3eb7c7061b750 - main.sh:d3d1bd0b56d8114eb7479964227f8576 - search.sh:81d08f5ff48e8a44b5f68387d426da05 - .updateDirectories:0ede00461e947494545e694040787b3f - From 9ea418b938a221683bed566eb8215d6dc4c212ed Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Wed, 8 Jun 2022 19:26:30 +0000 Subject: [PATCH 10/10] Java manifests should not be ever-expanding Co-authored-by: sigonasr2 --- Java/scripts/jar.sh | 2 +- Java/scripts/md5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Java/scripts/jar.sh b/Java/scripts/jar.sh index d201c59..3907142 100755 --- a/Java/scripts/jar.sh +++ b/Java/scripts/jar.sh @@ -5,7 +5,7 @@ rm -Rf bin/* javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp ${CLASS_PATH} -d ${OUT_DIR} ${PROJECT_DIR}/${PROJECT_NAME}.java printf "\n\n\nGenerating Manifest...\n\n" touch manifest -echo "Main-Class: ${MAIN_CLASS}" >> manifest +echo "Main-Class: ${MAIN_CLASS}" > manifest printf "\n\n\nCreating Jar...\n\n" ORIGINAL_LOC=$(pwd) cd ${OUT_DIR} diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 6ae0752..1412a3f 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,6 +1,6 @@ build.sh:22308eae5fd9c88aa16fef54cf03ae21 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - -jar.sh:343cf505530401fb696296bc25a9b090 - +jar.sh:9bbc25225e7356f9145f7c2b9ac72e30 - release.sh:b1b62203411b18d0fec1db3dc2e5a061 - update.sh:3be721658983183efa395984acd96b03 -