From cd306cd6c67f0e9bec5a08253e8ee1776177b4c1 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Sun, 15 May 2022 00:28:12 +0200
Subject: [PATCH] Fix scripts

---
 scripts/build.sh  | 11 +++++++----
 scripts/common.sh | 13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 4da3856..a79e85a 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,8 +1,8 @@
-
 source ./scripts/common.sh
 
 rm -rf "$STATIC_BUILD"
 rm -rf "$OUTPUT_DIR"
+rm -rf "$BASEDIR/resources"
 
 mkdir -p "$STATIC_BUILD"
 
@@ -11,14 +11,17 @@ cp -r "$STATIC_SRC/img"/* "$STATIC_BUILD/img"
 
 mkdir -p "$STATIC_BUILD/js"
 cp -r "$STATIC_SRC/js"/* "$STATIC_BUILD/js"
-cp $BASEDIR/node_modules/jquery/dist/jquery.min.js $STATIC_BUILD/js/jquery.min.js
-cp $BASEDIR/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js $STATIC_BUILD/js/bootstrap.min.js
+cp "$BASEDIR/node_modules/jquery/dist/jquery.min.js" "$STATIC_BUILD/js/jquery.min.js"
+cp "$BASEDIR/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" "$STATIC_BUILD/js/bootstrap.min.js"
 
 mkdir -p "$STATIC_BUILD/css"
 #cp -r "$STATIC_SRC/css"/* "$STATIC_BUILD/css"
 cp -r "$BASEDIR/node_modules/@fortawesome/fontawesome-free/css/all.min.css" "$STATIC_BUILD/css/font-awesome.css"
-hugo gen chromastyles --style=monokai > "$STATIC_BUILD/css/highlight.css"
 
 mkdir -p "$STATIC_BUILD/scss"
 cp -r "$STATIC_SRC/scss"/* "$STATIC_BUILD/scss"
+
+cp -r "$BASEDIR/node_modules/@fortawesome/fontawesome-free/webfonts" "$STATIC_BUILD"
+
+hugo gen chromastyles --style=monokai > "$STATIC_BUILD/css/highlight.css"
 hugo -vDEF --gc $@
diff --git a/scripts/common.sh b/scripts/common.sh
index b5f30d0..0c5dd25 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 
 BASEDIR="$PWD"
-OUTPUT_DIR="$BASEDIR/public"
-STATIC_SRC="$BASEDIR/static/src"
-STATIC_BUILD="$BASEDIR/static/build"
+export OUTPUT_DIR="$BASEDIR/public"
+export STATIC_SRC="$BASEDIR/static/src"
+export STATIC_BUILD="$BASEDIR/static/build"
 
-[[ -f "$BASEDIR/.env" ]] && export $(cat "$BASEDIR/.env" | xargs)
+if [[ -f "$BASEDIR/.env" ]]; then
+    export $(cat "$BASEDIR/.env" | xargs)
+fi
+
+NODE_BIN="$BASEDIR/node_modules/.bin"
+export PATH="$NODE_BIN:$PATH"