From b7295a3aab7c2a22abcbc469c0aa5b37b510721f Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 23 May 2022 18:02:14 +0000 Subject: [PATCH] Updated SigScripts Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> --- Java/scripts/build.sh | 2 +- Java/scripts/commit.sh | 14 +------------- Java/scripts/md5 | 4 ++-- utils/md5 | 2 +- utils/search.sh | 8 ++++---- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Java/scripts/build.sh b/Java/scripts/build.sh index bdcd96d..a9eba68 100755 --- a/Java/scripts/build.sh +++ b/Java/scripts/build.sh @@ -6,4 +6,4 @@ printf "\n\n\nRunning Program...\n\n" ORIGINAL_LOC=$(pwd) cd $OUT_DIR java ${MAIN_CLASS} "$@" -${ORIGINAL_LOC}/scripts/clean.sh \ No newline at end of file +${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh \ No newline at end of file diff --git a/Java/scripts/commit.sh b/Java/scripts/commit.sh index 03b6118..689cc0b 100755 --- a/Java/scripts/commit.sh +++ b/Java/scripts/commit.sh @@ -1,14 +1,6 @@ #Adds a commit message and pushes project to github repository. -# - -source utils/search.sh - -find . -type f -name md5 -delete - -#Generate a new hash for every sub-directory, which may require an update. -FILES=$(cat utils/.updateDirectories) +#Java COMMIT_MESSAGE="$*" -FIRST_LINE=true while IFS= read -r line do if [ "$FIRST_LINE" = true ]; then @@ -21,10 +13,6 @@ else Co-authored-by: $line" fi done < utils/.coauthors -for f in $FILES -do - search $f -done git add -u git add * git commit -m "$COMMIT_MESSAGE" diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 5b3e1c2..e1dbce1 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,4 +1,4 @@ -build.sh:a833e7598ad65672a9c01306d244b49f - +build.sh:377a432ffbd63b53322d1451a214201d - clean.sh:96ce35f2d2dcb555421e00a6afda23ca - -commit.sh:9c342703d765cad7ea296f16d68f29f4 - +commit.sh:b186d649fa17c68926fe1caec4a7216c - jar.sh:cce5e429168700490f9c413b665d13d6 - diff --git a/utils/md5 b/utils/md5 index 4bb78f1..7d6b2f1 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,5 +1,5 @@ .coauthors:6a70afcd3d554ff73e01a93ce090c992 - define.sh:74ea08fb12cab1053663f87007ddd29a - main.sh:eacf0984141d284db6681dee4dc39ffa - -search.sh:0e54450c506bedf1d73666156fa78e1a - +search.sh:24f4dabbe09354a0446e031ab3afe830 - .updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index 0d971a8..96b8681 100644 --- a/utils/search.sh +++ b/utils/search.sh @@ -24,7 +24,7 @@ function check() { if [ -f "$1/md5" ]; then echo " md5: https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1md5" - curl -H 'Cache-Control: no-cache, no-store' -s "https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1md5/?$(date +%s)" --output /tmp/out + curl -H 'Cache-Control: no-cache, no-store' -s "https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1md5" --output /tmp/out cmp -s $1/md5 /tmp/out if [ "$?" -ne 0 ] then @@ -41,15 +41,15 @@ function check() { if [ "$g" != ".coauthors" ]; then echo "++Redownload $1$g..." if [ -f "$1$g" ]; then - curl -H 'Cache-Control: no-cache, no-store' "https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g/?$(date +%s)" --output $1$g + curl -H 'Cache-Control: no-cache, no-store' "https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g" --output $1$g else 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/?$(date +%s)" --output $LANGUAGE/scripts/$g + curl -H 'Cache-Control: no-cache, no-store' "https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g" --output $LANGUAGE/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/?$(date +%s)" --output $1$g + curl -H 'Cache-Control: no-cache, no-store' "https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g" --output $1$g fi fi done < /tmp/out