diff --git a/build.sh b/build.sh index 859a29d..408129b 100755 --- a/build.sh +++ b/build.sh @@ -17,8 +17,8 @@ cp -R src/* $destination/ rm -rf $destination/scss ##Bootstrap -mkdir $destination/vendor/bootstrap/css -cp $destination/vendor/bootstrap/scss/bootstrap.min.css $destination/vendor/bootstrap/css -rm -rf $destination/vendor/bootstrap/scss +mkdir $destination/assets/vendor/bootstrap/css +cp $destination/assets/vendor/bootstrap/scss/bootstrap.min.css $destination/assets/vendor/bootstrap/css/bootstrap.min.css +rm -rf $destination/assets/vendor/bootstrap/scss echo "Finish!!" \ No newline at end of file diff --git a/compile-sass.sh b/compile-sass.sh index e09854f..13b5fcf 100755 --- a/compile-sass.sh +++ b/compile-sass.sh @@ -10,13 +10,13 @@ command -v sass >/dev/null 2>&1 || { echo "Compiling Sass..." #Bootstrap -cd src/vendor/bootstrap/scss +cd src/assets/vendor/bootstrap/scss sass bootstrap.scss:bootstrap.min.css --style compressed #Style do Tema -cd ../../../scss -sass -E 'UTF-8' style.scss:../style.css -cd .. +cd ../../../../assets/scss +sass -E 'UTF-8' style.scss:../../style.css +cd ../.. rm -rf style.css.map echo "Sass compilation Completed!" diff --git a/install.sh b/install.sh index 666eb6a..d6e9b35 100644 --- a/install.sh +++ b/install.sh @@ -7,9 +7,9 @@ echo "\nStarting installation with composer ... please wait!!"; echo "\nChecking if project folders exist ...\n\n"; if (!file_exists("vendor/bootstrap")) { - mkdir("src/vendor/bootstrap/", 0777, true); - mkdir("src/vendor/bootstrap/scss", 0777, true); - mkdir("src/vendor/bootstrap/js", 0777, true); + mkdir("src/assets/vendor/bootstrap/", 0777, true); + mkdir("src/assets/vendor/bootstrap/scss", 0777, true); + mkdir("src/assets/vendor/bootstrap/js", 0777, true); } echo "\nVerification completed...\n"; @@ -17,10 +17,10 @@ echo "\nVerification completed...\n"; echo "\nStarting Copying Files...\n"; echo "...Bootstrap\n"; -if (!file_exists("src/vendor/bootstrap/scss/bootstrap.scss")) { - recurse_copy("vendor/twbs/bootstrap/scss", "src/vendor/bootstrap/scss"); - copy("vendor/twbs/bootstrap/dist/js/bootstrap.min.js", "src/vendor/bootstrap/js/bootstrap.min.js"); -} + recurse_copy("vendor/twbs/bootstrap/scss", "src/assets/vendor/bootstrap/scss"); + copy("vendor/twbs/bootstrap/dist/js/bootstrap.min.js", "src/assets/vendor/bootstrap/js/bootstrap.min.js"); + copy("vendor/twbs/bootstrap/assets/js/vendor/popper.min.js", "src/assets/vendor/bootstrap/js/popper.min.js"); + echo "Finish!\n\n";