fixed website building python script

thomasWeise · thomasWeise · commit a537014c61b8 · 2024-06-17T12:30:29.000+08:00
diff --git a/make.sh b/make.sh
@@ -36,12 +36,12 @@ echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Finished printing all installed packages."
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We now execute the pdflatex compiler script."
 "$scriptDir/pdflatex.sh" "book.tex"
 
+echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We now execute the website building script."
+"$scriptDir/website.sh"
+
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Deactivating virtual environment."
 deactivate
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Deleting virtual environment."
 rm -rf "$tempDir"
 
-echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We now execute the website building script."
-"$scriptDir/website.sh"
-
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We have finished the book building process."
diff --git a/scripts/pdflatex.sh b/scripts/pdflatex.sh
@@ -30,10 +30,10 @@ echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We will use '$bibProgram' to process bibli
 "$bibProgram" --version
 
 if [[ $(declare -p PYTHON_INTERPRETER) == declare\ ?x* ]]; then
-  echo "Found python interpreter as: '$PYTHON_INTERPRETER'"
+  echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Found python interpreter as: '$PYTHON_INTERPRETER'"
 else
   export PYTHON_INTERPRETER="$(readlink -f "$(which python3)")"
-  echo "Setting up python interpreter as '$PYTHON_INTERPRETER'."
+  echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Setting up python interpreter as '$PYTHON_INTERPRETER'."
 fi
 
 latexGitProgram=("$PYTHON_INTERPRETER" "-m" "latexgit.aux")
diff --git a/scripts/website.sh b/scripts/website.sh
@@ -16,6 +16,13 @@ echo "$(date +'%0Y-%0m-%0d %0R:%0S'): The script directory is '$scriptDir'."
 currentDir="$(pwd)"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We are working in directory: '$currentDir'."
 
+if [[ $(declare -p PYTHON_INTERPRETER) == declare\ ?x* ]]; then
+  echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Found python interpreter as: '$PYTHON_INTERPRETER'"
+else
+  export PYTHON_INTERPRETER="$(readlink -f "$(which python3)")"
+  echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Setting up python interpreter as '$PYTHON_INTERPRETER'."
+fi
+
 websiteDir="$currentDir/website"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): We will build the website into: '$websiteDir'."
 
@@ -44,7 +51,7 @@ PART_A='<!DOCTYPE html><html><title>'
 PART_B='</title><style>code {background-color:rgb(204 210 95 / 0.3);white-space:nowrap;border-radius:3px}</style><body style="margin-left:5%;margin-right:5%">'
 PART_C='</body></html>'
 BASE_URL='https\:\/\/thomasweise\.github\.io\/programmingWithPython\/'
-echo "${PART_A}Programming with Python${PART_B}$(python3 -m markdown -o html ./README.md)$PART_C" > "$websiteDir/index.html"
+echo "${PART_A}Programming with Python${PART_B}$("$PYTHON_INTERPRETER" -m markdown -o html ./README.md)$PART_C" > "$websiteDir/index.html"
 sed -i "s/\"$BASE_URL/\".\//g" "$websiteDir/index.html"
 sed -i "s/=$BASE_URL/=.\//g" "$websiteDir/index.html"
 sed -i "s/<\/h1>/<\/h1><h2>built on\&nbsp;$(date +'%0Y-%0m-%0d %0R:%0S')<\/h2>/g" "$websiteDir/index.html"
@@ -53,10 +60,9 @@ echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Finished copying README.md to index.html."
 
 cd "$websiteDir"
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Now minifying website."
-find -type f -name "*.html" -exec python3 -c "print('{}');import minify_html;f=open('{}','r');s=f.read();f.close();s=minify_html.minify(s,do_not_minify_doctype=True,ensure_spec_compliant_unquoted_attribute_values=True,keep_html_and_head_opening_tags=False,minify_css=True,minify_js=True,remove_bangs=True,remove_processing_instructions=True);f=open('{}','w');f.write(s);f.close()" \;
+find -type f -name "*.html" -exec "$PYTHON_INTERPRETER" -c "print('{}');import minify_html;f=open('{}','r');s=f.read();f.close();s=minify_html.minify(s,do_not_minify_doctype=True,ensure_spec_compliant_unquoted_attribute_values=True,keep_html_and_head_opening_tags=False,minify_css=True,minify_js=True,remove_bangs=True,remove_processing_instructions=True);f=open('{}','w');f.write(s);f.close()" \;
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): Done minifying website."
 
 cd "$currentDir"
 
 echo "$(date +'%0Y-%0m-%0d %0R:%0S'): The website building script has successfully completed."
-
