diff --git a/utils/md5 b/utils/md5 index 0289163..c8dfbfa 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,5 +1,5 @@ .coauthors:3785ad38663e5fc43e574914ad067294 - define.sh:d6b20a25a04a60d94f466e48fa60ac69 - main.sh:32a1f953ffca8584d1eb57c0ecd8a582 - -search.sh:6eec52214a36f2114442c41ab9c04f72 - +search.sh:3bb694c12bf2416d625c061ffa9d4225 - .updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index dd40bcf..a932d55 100644 --- a/utils/search.sh +++ b/utils/search.sh @@ -34,32 +34,33 @@ 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 - else - curl -H 'Cache-Control: no-cache, no-store' https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g --output $1$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 + 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 + else + curl -H 'Cache-Control: no-cache, no-store' https://raw.githubusercontent.com/sigonasr2/SigScript/main/$1$g --output $1$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 - 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