From 6274ddb5033a8c18229bc2bbd11ac54bf7f0a7c0 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 23 May 2022 17:17:21 +0000 Subject: [PATCH] Update scripts Co-authored-by: sigonasr2 --- scripts/commit.sh | 6 ++++++ scripts/jar.sh | 4 ++-- scripts/md5 | 4 ++-- utils/md5 | 2 +- utils/search.sh | 4 +++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/commit.sh b/scripts/commit.sh index 6c49768..689cc0b 100755 --- a/scripts/commit.sh +++ b/scripts/commit.sh @@ -3,9 +3,15 @@ COMMIT_MESSAGE="$*" while IFS= read -r line do +if [ "$FIRST_LINE" = true ]; then COMMIT_MESSAGE+=" Co-authored-by: $line" +FIRST_LINE=false +else + COMMIT_MESSAGE+=" +Co-authored-by: $line" +fi done < utils/.coauthors git add -u git add * diff --git a/scripts/jar.sh b/scripts/jar.sh index 441b43b..ed70855 100755 --- a/scripts/jar.sh +++ b/scripts/jar.sh @@ -10,7 +10,7 @@ ORIGINAL_LOC=$(pwd) cd ${OUT_DIR} jar cfm ${PROJECT_NAME}.jar ${ORIGINAL_LOC}/manifest sig printf "\n\n\nRunning Program...\n\n" -java -jar ${PROJECT_NAME}.jar +java -jar ${PROJECT_NAME}.jar "$@" mv ${PROJECT_NAME}.jar ${ORIGINAL_LOC} cd .. -./scripts/clean.sh \ No newline at end of file +./scripts/clean.sh diff --git a/scripts/md5 b/scripts/md5 index c4273a3..d765a0e 100644 --- a/scripts/md5 +++ b/scripts/md5 @@ -1,5 +1,5 @@ build.sh:a833e7598ad65672a9c01306d244b49f - clean.sh:96ce35f2d2dcb555421e00a6afda23ca - -commit.sh:21af1fa6f09d01679c9e11408967264a - -jar.sh:2ac636f584c43a1124affb9ea6bdc7bf - +commit.sh:b186d649fa17c68926fe1caec4a7216c - +jar.sh:62ce62bbb97d3f3856bcc9b0ad34083c - lean.sh:3be7b8b182ccd96e48989b4e57311193 - diff --git a/utils/md5 b/utils/md5 index 715e752..0289163 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,5 +1,5 @@ .coauthors:3785ad38663e5fc43e574914ad067294 - define.sh:d6b20a25a04a60d94f466e48fa60ac69 - main.sh:32a1f953ffca8584d1eb57c0ecd8a582 - -search.sh:28d0ede8345514d80cc68cc756870002 - +search.sh:6eec52214a36f2114442c41ab9c04f72 - .updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index 5392df5..dd40bcf 100644 --- a/utils/search.sh +++ b/utils/search.sh @@ -37,6 +37,7 @@ function check() { if [ "$g" != "md5" ]; then if [ -f $1$g ]; then + if [ "$g" != ".coauthors" ]; then echo "++Redownload $1$g..." if [ -f "$1$g" ]; then #Read the 2nd line and see if it has a special directory. @@ -58,6 +59,7 @@ function check() { echo "===Could not find directory, assuming regular scripts directory exists." curl -H 'Cache-Control: no-cache, no-store' https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g --output scripts/$g fi + fi else echo "++==Downloading $1$g..." curl -H 'Cache-Control: no-cache, no-store' https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g --output $1$g @@ -74,4 +76,4 @@ function check() { check $1$g/ fi done -} \ No newline at end of file +}