README.md

@@ -20,9 +20,9 @@ While it may sound too good to be true, that's because it is. Maple Linux does n
 
 Maple Linux is built upon software created by various developers, and is distributed under various licenses as a result. While it isn't one of the main goals of the system, especially since Linux itself is copyleft, I aim to create an operating system that's as free as I can reasonably make it.
 
-![Licensing Summary](licensebar.svg)
+![Licensing Summary](docs/licensebar.svg)
 
-For more information about the software included in this project and its licensing, see [SOFTWARE.md](./SOFTWARE.md).
+For more information about the software included in this project and its licensing, see [SOFTWARE.md](docs/SOFTWARE.md).
 
 ### Filesystem Hierarchy
 

scripts/bootstrap.sh

@@ -23,7 +23,7 @@ export CXXFLAGS=$CFLAGS
 export RANLIB=llvm-ranlib
 export LD=ld.lld
 export LDFLAGS="--sysroot=$BOOTSTRAP/root"
-export TREETAP=$(pwd)/treetap
+export TREETAP=$(pwd)/scripts/treetap
 export TT_DIR=$(pwd)/.treetap
 export TT_MICROARCH=$MICROARCH
 export TT_SYSROOT=$BOOTSTRAP/root
@@ -35,8 +35,10 @@ $TREETAP fetch sources/llvm/llvm.spec
 $TREETAP fetch sources/musl/musl.spec
 
 # Make sure both clang-tblgen and llvm-tblgen are in the PATH. ~ahill
+echo -n "Verifying that clang-tblgen and llvm-tblgen are in the PATH... "
 ! which clang-tblgen && exit 1
 ! which llvm-tblgen && exit 1
+echo "Done!"
 
 # Simplified filesystem heirarchy with symlinks for compatibility
 mkdir -p $BOOTSTRAP/root/{bin,boot/EFI/BOOT,dev,etc,home,lib,proc,run,sys,tmp,usr/{include,share},var/{cache,lib,log,spool,tmp}}
@@ -235,7 +237,7 @@ cp $TREETAP $BOOTSTRAP/root/bin/
 
 # Prepare for chroot build
 mkdir -p $BOOTSTRAP/root/maple/
-cp $BOOTSTRAP/../rootbuild.sh $BOOTSTRAP/root/maple/
+cp $BOOTSTRAP/../scripts/rootbuild.sh $BOOTSTRAP/root/maple/
 export TT_DIR=$BOOTSTRAP/root/maple/.treetap
 SOURCES=(
     autoconf

scripts/licensebar.sh

@@ -1,12 +1,12 @@
 #!/bin/sh -e
-# Usage: ./licensebar.sh > licensebar.svg
+# Usage: ./licensebar.sh docs/SOFTWARE.md > licensebar.svg
 # Yes, this is cursed, but it was the simplest way I could think of automating this. ~ahill
-COPYLEFT_COUNT=$(grep "| Copyleft  " SOFTWARE.md | wc -l)
+COPYLEFT_COUNT=$(grep "| Copyleft  " $1 | wc -l)
-SLIGHTLY_COPYLEFT_COUNT=$(grep "| Slightly Copyleft  " SOFTWARE.md | wc -l)
+SLIGHTLY_COPYLEFT_COUNT=$(grep "| Slightly Copyleft  " $1 | wc -l)
-FREE_COUNT=$(grep "| Free  " SOFTWARE.md | wc -l)
+FREE_COUNT=$(grep "| Free  " $1 | wc -l)
-MIXED_COUNT=$(grep "| Mixed  " SOFTWARE.md | wc -l)
+MIXED_COUNT=$(grep "| Mixed  " $1 | wc -l)
-SLIGHTLY_COPYRIGHT_COUNT=$(grep "| Slightly Copyright |" SOFTWARE.md | wc -l)
+SLIGHTLY_COPYRIGHT_COUNT=$(grep "| Slightly Copyright |" $1 | wc -l)
-COPYRIGHT_COUNT=$(grep "| Copyright  " SOFTWARE.md | wc -l)
+COPYRIGHT_COUNT=$(grep "| Copyright  " $1 | wc -l)
 
 BAR_BORDER=3
 BAR_HEIGHT=16

scripts/rescue.sh

@@ -5,7 +5,7 @@
 # rebuild after something like diffutils fails to build. ~ahill
 
 # The following script was created with:
-# sh -c "grep export bootstrap.sh | sed /CCACHE/d; echo zsh" >> rescue.sh
+# sh -c "grep export scripts/bootstrap.sh | sed /CCACHE/d; echo zsh" >> scripts/rescue.sh
 
 export MICROARCH=skylake
 export TARGET=x86_64-maple-linux-musl
@@ -23,7 +23,7 @@ export CXXFLAGS=$CFLAGS
 export RANLIB=llvm-ranlib
 export LD=ld.lld
 export LDFLAGS="--sysroot=$BOOTSTRAP/root"
-export TREETAP=$(pwd)/treetap
+export TREETAP=$(pwd)/scripts/treetap
 export TT_DIR=$(pwd)/.treetap
 export TT_MICROARCH=$MICROARCH
 export TT_SYSROOT=$BOOTSTRAP/root