diff --git a/scripts/build.sh b/Java/scripts/build.sh similarity index 83% rename from scripts/build.sh rename to Java/scripts/build.sh index bdcd96d..a9eba68 100755 --- a/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/scripts/clean.sh b/Java/scripts/clean.sh similarity index 100% rename from scripts/clean.sh rename to Java/scripts/clean.sh diff --git a/scripts/commit.sh b/Java/scripts/commit.sh similarity index 65% rename from scripts/commit.sh rename to Java/scripts/commit.sh index 6c49768..36b45b5 100755 --- a/scripts/commit.sh +++ b/Java/scripts/commit.sh @@ -1,11 +1,18 @@ #Adds a commit message and pushes project to github repository. #Java COMMIT_MESSAGE="$*" +FIRST_LINE=true 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/Java/scripts/jar.sh similarity index 89% rename from scripts/jar.sh rename to Java/scripts/jar.sh index ed70855..532ab48 100755 --- a/scripts/jar.sh +++ b/Java/scripts/jar.sh @@ -11,6 +11,5 @@ cd ${OUT_DIR} jar cfm ${PROJECT_NAME}.jar ${ORIGINAL_LOC}/manifest sig printf "\n\n\nRunning Program...\n\n" java -jar ${PROJECT_NAME}.jar "$@" -mv ${PROJECT_NAME}.jar ${ORIGINAL_LOC} cd .. -./scripts/clean.sh +./${LANGUAGE}/scripts/clean.sh diff --git a/Java/scripts/md5 b/Java/scripts/md5 new file mode 100644 index 0000000..ebe703e --- /dev/null +++ b/Java/scripts/md5 @@ -0,0 +1,4 @@ +build.sh:377a432ffbd63b53322d1451a214201d - +clean.sh:96ce35f2d2dcb555421e00a6afda23ca - +commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - +jar.sh:cce5e429168700490f9c413b665d13d6 - diff --git a/scripts/lean.sh b/scripts/lean.sh deleted file mode 100644 index 1becba2..0000000 --- a/scripts/lean.sh +++ /dev/null @@ -1 +0,0 @@ -404: Not Found \ No newline at end of file diff --git a/scripts/md5 b/scripts/md5 deleted file mode 100644 index 13db900..0000000 --- a/scripts/md5 +++ /dev/null @@ -1,5 +0,0 @@ -build.sh:de32fdf9f3ce9eb5d4ea9902ee48dbe0 *- -clean.sh:8aec15e447257f1c3a4e978f1b56a78e *- -commit.sh:21af1fa6f09d01679c9e11408967264a *- -jar.sh:62ce62bbb97d3f3856bcc9b0ad34083c *- -lean.sh:3be7b8b182ccd96e48989b4e57311193 *- diff --git a/sig b/sig index 6165b90..0ad829d 100755 --- a/sig +++ b/sig @@ -4,5 +4,6 @@ define PROJECT_NAME "ArcadeScreenshotHandler" define PROJECT_DIR "src/sig" define MAIN_CLASS "sig.${PROJECT_NAME}" define OUT_DIR "bin" +define LANGUAGE "Java" source utils/main.sh \ No newline at end of file diff --git a/utils/define.sh b/utils/define.sh index 0926c6c..39a23d7 100755 --- a/utils/define.sh +++ b/utils/define.sh @@ -1,5 +1,7 @@ export VARS=("") +export LANGUAGE="" + function define() { VARS+=("$1") value="${*:2}" diff --git a/utils/main.sh b/utils/main.sh index 645950d..b04ffab 100644 --- a/utils/main.sh +++ b/utils/main.sh @@ -13,11 +13,11 @@ if [ -z "$1" ] echo "" echo "" echo " Command List:" - FILES=$(ls -1A ./scripts | sed -e 's/\.sh$//' | sed -e 's/^/ /') + FILES=$(ls -1A ./$LANGUAGE/scripts | sed -e 's/\.sh$//' | sed -e 's/^/ /') for f in $FILES do if [ $f != "md5" ]; then - DESC="$(head -n1 ./scripts/$f.sh)" + DESC="$(head -n1 ./$LANGUAGE/scripts/$f.sh)" printf "\n\t%-15s%-65s" $f "${DESC:1}" fi done @@ -25,4 +25,4 @@ if [ -z "$1" ] exit fi -./scripts/$1.sh "${*:2}" \ No newline at end of file +./$LANGUAGE/scripts/$1.sh "${*:2}" \ No newline at end of file diff --git a/utils/md5 b/utils/md5 index 81ea9d5..0dd7654 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,5 +1,5 @@ -.coauthors:3785ad38663e5fc43e574914ad067294 *- -.updateDirectories:0ede00461e947494545e694040787b3f *- -define.sh:d6b20a25a04a60d94f466e48fa60ac69 *- -main.sh:32a1f953ffca8584d1eb57c0ecd8a582 *- -search.sh:6eec52214a36f2114442c41ab9c04f72 *- +.coauthors:3785ad38663e5fc43e574914ad067294 - +define.sh:74ea08fb12cab1053663f87007ddd29a - +main.sh:eacf0984141d284db6681dee4dc39ffa - +search.sh:24f4dabbe09354a0446e031ab3afe830 - +.updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index dd40bcf..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 --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 @@ -34,35 +34,22 @@ function check() { do IFS=':' read -ra split <<< $line g="${split[0]}" + echo "LINE -- $g" 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. - CHECKLINE=$(sed -n '2{p;q;}' $1$g) - if [ "${CHECKLINE:0:1}" = "#" ]; then - #This could be a different diff, try that one. - echo " md5: https://raw.githubusercontent.com/sigonasr2/SigScript/main/${CHECKLINE:1}/$1md5" - curl -H 'Cache-Control: no-cache, no-store' -s https://raw.githubusercontent.com/sigonasr2/SigScript/main/${CHECKLINE:1}/$1md5 --output /tmp/out - cmp -s $1/md5 /tmp/out - if [ "$?" -ne 0 ] - then - echo " Differences detected here too." - curl -H 'Cache-Control: no-cache, no-store' https://raw.githubusercontent.com/sigonasr2/SigScript/main/${CHECKLINE:1}/$1$g --output $1$g - fi + 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" --output $1$g else - curl -H 'Cache-Control: no-cache, no-store' https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g --output $1$g + 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 $LANGUAGE/scripts/$g fi - 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 --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 + 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